diff --git a/pandora_console/extensions/quick_shell.php b/pandora_console/extensions/quick_shell.php
index 644e9aa564..ecd9300614 100644
--- a/pandora_console/extensions/quick_shell.php
+++ b/pandora_console/extensions/quick_shell.php
@@ -318,15 +318,15 @@ function quickShellSettings()
         );
         $gotty_host = get_parameter(
             'gotty_host',
-            $config['gotty_host']
+            ''
         );
         $gotty_ssh_port = get_parameter(
             'gotty_ssh_port',
-            $config['gotty_ssh_port']
+            ''
         );
         $gotty_telnet_port = get_parameter(
             'gotty_telnet_port',
-            $config['gotty_telnet_port']
+            ''
         );
 
         $gotty_user = get_parameter(
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 96f266fc1e..e003461c5b 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -354,18 +354,6 @@ function config_update_config()
                     if (!config_update_value('email_password', io_input_password(get_parameter('email_password')))) {
                         $error_update[] = __('Email password');
                     }
-
-                    if (!config_update_value('ws_bind_address', get_parameter('ws_bind_address'))) {
-                        $error_update[] = __('WebSocket bind address');
-                    }
-
-                    if (!config_update_value('ws_port', get_parameter('ws_port'))) {
-                        $error_update[] = __('WebSocket port');
-                    }
-
-                    if (!config_update_value('ws_proxy_url', get_parameter('ws_proxy_url'))) {
-                        $error_update[] = __('WebSocket proxy url');
-                    }
                 break;
 
                 case 'enterprise':
@@ -1599,6 +1587,20 @@ function config_update_config()
                     }
                 break;
 
+                case 'websocket_engine':
+                    if (!config_update_value('ws_bind_address', get_parameter('ws_bind_address'))) {
+                        $error_update[] = __('WebSocket bind address');
+                    }
+
+                    if (!config_update_value('ws_port', get_parameter('ws_port'))) {
+                        $error_update[] = __('WebSocket port');
+                    }
+
+                    if (!config_update_value('ws_proxy_url', get_parameter('ws_proxy_url'))) {
+                        $error_update[] = __('WebSocket proxy url');
+                    }
+                break;
+
                 default:
                     // Ignore.
                 break;