diff --git a/gnome/src/monitormanager.js b/gnome/src/monitormanager.js
index 86281e1..025a6c8 100644
--- a/gnome/src/monitormanager.js
+++ b/gnome/src/monitormanager.js
@@ -322,13 +322,13 @@ export const MonitorManager = GObject.registerClass({
                     return;
                 }
 
+                this._needsConfigCheck = false;
                 if (error) {
                     Globals.logger.log(`Failed to switch to optimal mode for monitor ${monitorConnector}: ${error}`);
 
                     // tell the extension to proceed, this should result in another config check
                     this._changeHookFn();
                 } else {
-                    this._needsConfigCheck = false;
                     if (configChanged) {
                         Globals.logger.log(`Switched to optimal mode for monitor ${monitorConnector}`);
                     } else if (!!this._changeHookFn) {
diff --git a/modules/XRLinuxDriver b/modules/XRLinuxDriver
index 9acfa06..4ce360a 160000
--- a/modules/XRLinuxDriver
+++ b/modules/XRLinuxDriver
@@ -1 +1 @@
-Subproject commit 9acfa064d9e503973c3c3f9b7667ab30ba286e55
+Subproject commit 4ce360a936937e8dd0ebd54a337fec54bb38f497