diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp
index 8814c25f4..a1d364fc3 100644
--- a/radio/src/gui/128x64/model_setup.cpp
+++ b/radio/src/gui/128x64/model_setup.cpp
@@ -1432,7 +1432,8 @@ void menuModelSetup(event_t event)
             }
             uint8_t newFlag = 0;
 #if defined(MULTIMODULE)
-            if (getMultiBindStatus(moduleIdx) == MULTI_BIND_FINISHED) {
+            if (isModuleMultimodule(moduleIdx) &&
+                getMultiBindStatus(moduleIdx) == MULTI_BIND_FINISHED) {
               setMultiBindStatus(moduleIdx, MULTI_BIND_NONE);
               s_editMode = 0;
             }
@@ -1488,11 +1489,11 @@ void menuModelSetup(event_t event)
             moduleState[moduleIdx].mode = newFlag;
 
 #if defined(MULTIMODULE)
-            if (newFlag == MODULE_MODE_BIND) {
+            if (isModuleMultimodule(moduleIdx) &&
+                (newFlag == MODULE_MODE_BIND)) {
               setMultiBindStatus(moduleIdx, MULTI_BIND_INITIATED);
             }
 #endif
-
           }
         }
         break;
diff --git a/radio/src/gui/212x64/model_setup.cpp b/radio/src/gui/212x64/model_setup.cpp
index 2bc541987..05b256635 100644
--- a/radio/src/gui/212x64/model_setup.cpp
+++ b/radio/src/gui/212x64/model_setup.cpp
@@ -1255,7 +1255,8 @@ void menuModelSetup(event_t event)
             }
             uint8_t newFlag = 0;
 #if defined(MULTIMODULE)
-            if (getMultiBindStatus(moduleIdx) == MULTI_BIND_FINISHED) {
+            if (isModuleMultimodule(moduleIdx) &&
+                getMultiBindStatus(moduleIdx) == MULTI_BIND_FINISHED) {
               setMultiBindStatus(moduleIdx, MULTI_BIND_NONE);
               s_editMode = 0;
             }
@@ -1294,7 +1295,8 @@ void menuModelSetup(event_t event)
             }
             moduleState[moduleIdx].mode = newFlag;
 #if defined(MULTIMODULE)
-            if (newFlag == MODULE_MODE_BIND) {
+            if (isModuleMultimodule(moduleIdx) &&
+                (newFlag == MODULE_MODE_BIND)) {
               setMultiBindStatus(moduleIdx, MULTI_BIND_INITIATED);
             }
 #endif