diff --git a/src_assets/common/assets/web/config.html b/src_assets/common/assets/web/config.html
index ba518879..fb3bb738 100644
--- a/src_assets/common/assets/web/config.html
+++ b/src_assets/common/assets/web/config.html
@@ -356,10 +356,14 @@
             if (typeof this.config[optionKey] === "string") {
               this.config[optionKey] = JSON.parse(this.config[optionKey]);
             } else {
-              this.config[optionKey] = [];
+              this.config[optionKey] = null;
             }
           }
 
+          this.config.dd_mode_remapping ??= {mixed: [], resolution_only: [], refresh_rate_only: []};
+          this.config.global_prep_cmd ??= [];
+          this.config.server_cmd ??= [];
+
           // Populate default values from tabs options
           this.tabs.forEach(tab => {
             Object.keys(tab.options).forEach(optionKey => {
diff --git a/src_assets/common/assets/web/public/assets/locale/en.json b/src_assets/common/assets/web/public/assets/locale/en.json
index b8f8a439..99e18158 100644
--- a/src_assets/common/assets/web/public/assets/locale/en.json
+++ b/src_assets/common/assets/web/public/assets/locale/en.json
@@ -191,6 +191,8 @@
     "dd_config_label": "Device configuration",
     "dd_config_revert_delay": "Config revert delay",
     "dd_config_revert_delay_desc": "Additional delay in milliseconds to wait before reverting configuration when the app has been closed or the last session terminated. Main purpose is to provide a smoother transition when quickly switching between apps.",
+    "dd_config_revert_on_disconnect": "Config revert on disconnect",
+    "dd_config_revert_on_disconnect_desc": "Revert configuration upon disconnect of all clients instead of app close or last session termination.",
     "dd_config_verify_only": "Verify that the display is enabled",
     "dd_hdr_option": "HDR",
     "dd_hdr_option_auto": "Switch on/off the HDR mode as requested by the client (default)",