diff --git a/src/config.cpp b/src/config.cpp
index e01deb91..f5ecb5ae 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -515,7 +515,7 @@ namespace config {
     },  // display_device
 
     1,  // min_fps_factor
-    0  // max_bitrate
+    0,  // max_bitrate
 
     "1920x1080x60",  // fallback_mode
   };
diff --git a/src/process.cpp b/src/process.cpp
index 11fcee1c..420e80d4 100644
--- a/src/process.cpp
+++ b/src/process.cpp
@@ -445,34 +445,42 @@ namespace proc {
         retryInterval *= 2;
       }
 
+      retryInterval = 200ms;
+      while (this->display_name.empty()) {
+        if (retryInterval > 2s) {
+          BOOST_LOG(warning) << "Not getting current display in time! HDR will not be toggled.";
+          return;
+        }
+        std::this_thread::sleep_for(retryInterval);
+        retryInterval *= 2;
+      }
+
       // We should have got the actual streaming display by now
       std::string currentDisplay = this->display_name;
-      if (currentDisplay.empty()) {
-        BOOST_LOG(warning) << "Not getting current display in time! HDR will not be toggled.";
-      } else {
-        auto currentDisplayW = platf::from_utf8(currentDisplay).c_str();
+      auto currentDisplayW = platf::from_utf8(currentDisplay).c_str();
 
-        bool initial_hdr = VDISPLAY::getDisplayHDRByName(currentDisplayW);
+      initial_hdr = VDISPLAY::getDisplayHDRByName(currentDisplayW);
 
-        if (config::video.dd.hdr_option == config::video_t::dd_t::hdr_option_e::automatic) {
-          if (!VDISPLAY::setDisplayHDRByName(currentDisplayW, false)) {
-            return;
-          }
+      if (config::video.dd.hdr_option == config::video_t::dd_t::hdr_option_e::automatic) {
+        mode_changed_display = currentDisplay;
 
-          if (enable_hdr) {
-            if (VDISPLAY::setDisplayHDRByName(currentDisplayW, true)) {
-              BOOST_LOG(info) << "HDR enabled for display " << currentDisplay;
-            } else {
-              BOOST_LOG(info) << "HDR enable failed for display " << currentDisplay;
-            }
-          }
-        } else if (initial_hdr) {
-          if (VDISPLAY::setDisplayHDRByName(currentDisplayW, false) && VDISPLAY::setDisplayHDRByName(currentDisplayW, true)) {
-            BOOST_LOG(info) << "HDR toggled successfully for display " << currentDisplay;
+        if (!VDISPLAY::setDisplayHDRByName(currentDisplayW, false)) {
+          return;
+        }
+
+        if (enable_hdr) {
+          if (VDISPLAY::setDisplayHDRByName(currentDisplayW, true)) {
+            BOOST_LOG(info) << "HDR enabled for display " << currentDisplay;
           } else {
-            BOOST_LOG(info) << "HDR toggle failed for display " << currentDisplay;
+            BOOST_LOG(info) << "HDR enable failed for display " << currentDisplay;
           }
         }
+      } else if (initial_hdr) {
+        if (VDISPLAY::setDisplayHDRByName(currentDisplayW, false) && VDISPLAY::setDisplayHDRByName(currentDisplayW, true)) {
+          BOOST_LOG(info) << "HDR toggled successfully for display " << currentDisplay;
+        } else {
+          BOOST_LOG(info) << "HDR toggle failed for display " << currentDisplay;
+        }
       }
     });
 
@@ -570,6 +578,16 @@ namespace proc {
     bool has_run = _app_id > 0;
 
 #ifdef _WIN32
+    // Revert HDR state
+    if (has_run && !mode_changed_display.empty()) {
+      auto displayNameW = platf::from_utf8(mode_changed_display);
+      if (VDISPLAY::setDisplayHDRByName(displayNameW.c_str(), initial_hdr)) {
+        BOOST_LOG(info) << "HDR reverted for display " << mode_changed_display;
+      } else {
+        BOOST_LOG(info) << "HDR revert failed for display " << mode_changed_display;
+      }
+    }
+
     bool used_virtual_display = vDisplayDriverStatus == VDISPLAY::DRIVER_STATUS::OK && _launch_session && this->virtual_display;
     if (used_virtual_display) {
       if (VDISPLAY::removeVirtualDisplay(_launch_session->display_guid)) {
@@ -599,8 +617,8 @@ namespace proc {
 
     // Load the configured output_name first
     // to prevent the value being write to empty when the initial terminate happens
-    if (!has_run && proc.initial_display.empty()) {
-      proc.initial_display = config::video.output_name;
+    if (!has_run && initial_display.empty()) {
+      initial_display = config::video.output_name;
     } else {
       // Restore output name to its original value
       config::video.output_name = initial_display;
@@ -611,6 +629,7 @@ namespace proc {
     _app = {};
     display_name.clear();
     initial_display.clear();
+    mode_changed_display.clear();
     _launch_session.reset();
     virtual_display = false;
     allow_client_commands = false;
diff --git a/src/process.h b/src/process.h
index 20cad44e..2de49536 100644
--- a/src/process.h
+++ b/src/process.h
@@ -90,6 +90,8 @@ namespace proc {
 
     std::string display_name;
     std::string initial_display;
+    std::string mode_changed_display;
+    bool initial_hdr;
     bool virtual_display;
     bool allow_client_commands;
 
diff --git a/src_assets/common/assets/web/configs/tabs/audiovideo/DisplayDeviceOptions.vue b/src_assets/common/assets/web/configs/tabs/audiovideo/DisplayDeviceOptions.vue
index e27cf212..79a6d117 100644
--- a/src_assets/common/assets/web/configs/tabs/audiovideo/DisplayDeviceOptions.vue
+++ b/src_assets/common/assets/web/configs/tabs/audiovideo/DisplayDeviceOptions.vue
@@ -126,7 +126,7 @@ function addRemappingEntry() {
               </div>
 
               <!-- HDR option -->
-              <div class="mb-3" v-if="config.dd_configuration_option !== 'disabled'">
+              <div class="mb-3">
                 <label for="dd_hdr_option" class="form-label">
                   {{ $t('config.dd_hdr_option') }}
                 </label>
@@ -135,11 +135,12 @@ function addRemappingEntry() {
                   <option value="auto">{{ $t('config.dd_hdr_option_auto') }}</option>
                 </select>
                 <!-- HDR toggle -->
-                <Checkbox id="dd_wa_hdr_toggle"
+                <!-- <Checkbox id="dd_wa_hdr_toggle"
                           locale-prefix="config"
                           v-model="config.dd_wa_hdr_toggle"
                           default="false"
-                ></Checkbox>
+                          v-if="config.dd_configuration_option !== 'disabled'"
+                ></Checkbox> -->
               </div>
 
               <!-- Config revert delay -->