diff --git a/companion/src/eeprominterface.cpp b/companion/src/eeprominterface.cpp
index 2bd8ff4ca..a69b12851 100644
--- a/companion/src/eeprominterface.cpp
+++ b/companion/src/eeprominterface.cpp
@@ -1366,7 +1366,9 @@ void ModelData::setDefaultValues(unsigned int id, const GeneralSettings & settin
   clear();
   used = true;
   sprintf(name, "MODEL%02d", id+1);
-  moduleData[0].modelId = id+1;
+  for (int i=0; i<C9X_NUM_MODULES; i++) {
+    moduleData[i].modelId = id+1;
+  }
   setDefaultMixes(settings);
 }
 
diff --git a/radio/src/lua_api.cpp b/radio/src/lua_api.cpp
index 4a41a73a1..e12b3f327 100644
--- a/radio/src/lua_api.cpp
+++ b/radio/src/lua_api.cpp
@@ -638,7 +638,7 @@ static int luaModelSetModule(lua_State *L)
         module.rfProtocol = luaL_checkinteger(L, -1);
       }
       else if (!strcmp(key, "modelId")) {
-        g_model.header.modelId[idx] = luaL_checkinteger(L, -1);
+        g_model.header.modelId[idx] = modelHeaders[g_eeGeneral.currModel].modelId[idx] = luaL_checkinteger(L, -1);
       }
       else if (!strcmp(key, "firstChannel")) {
         module.channelsStart = luaL_checkinteger(L, -1);
diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index aa219c2dc..4c7ae9014 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -379,13 +379,12 @@ void checkModelIdUnique(uint8_t index, uint8_t module)
   uint8_t modelId = g_model.header.modelId[module];
   if (modelId != 0) {
     for (uint8_t i=0; i<MAX_MODELS; i++) {
-      for (uint8_t j=0; j<NUM_MODULES; j++) {
-        if (i == index && module == j) {
-          continue;
-        }
-        else if (modelId == modelHeaders[i].modelId[j]) {
-          POPUP_WARNING(STR_MODELIDUSED);
-          return;
+      if (i != index) {
+        for (uint8_t j=0; j<NUM_MODULES; j++) {
+          if (modelId == modelHeaders[i].modelId[j]) {
+            POPUP_WARNING(STR_MODELIDUSED);
+            return;
+          }
         }
       }
     }
@@ -421,9 +420,10 @@ void modelDefault(uint8_t id)
   g_model.externalModule = MODULE_TYPE_PPM;
 #endif
 
-#if defined(PXX) && defined(CPUARM)
-  modelHeaders[id].modelId[1] = g_model.header.modelId[1] = 0;
-  modelHeaders[id].modelId[0] = g_model.header.modelId[0] = id+1;
+#if defined(CPUARM)
+  for (int i=0; i<NUM_MODULES; i++) {
+    modelHeaders[id].modelId[i] = g_model.header.modelId[i] = id+1;
+  }
   checkModelIdUnique(id, 0);
 #endif