diff --git a/companion/src/modeledit/setup.cpp b/companion/src/modeledit/setup.cpp
index e0fbbf606..270e9b87b 100644
--- a/companion/src/modeledit/setup.cpp
+++ b/companion/src/modeledit/setup.cpp
@@ -298,8 +298,10 @@ void ModulePanel::setupFailsafes()
     }
   }
 
-  if (!hasFailsafe)
+  if (!hasFailsafe) {
+    lock = false;
     return;
+  }
 
   int row = 0;
   int col = 0;