diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp
index 68b0dd210..4373bf497 100644
--- a/radio/src/gui/128x64/model_setup.cpp
+++ b/radio/src/gui/128x64/model_setup.cpp
@@ -1111,7 +1111,7 @@ void menuModelSetup(event_t event)
       break;
 #endif
 
-#if defined(AFHDS3)
+#if defined(AFHDS3) && defined(HARDWARE_EXTERNAL_MODULE)
       case ITEM_MODEL_SETUP_EXTERNAL_MODULE_AFHDS_PROTOCOL:
         lcdDrawText(INDENT_WIDTH, y, STR_PROTOCOL);
         lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_AFHDS3_PROTOCOLS, g_model.moduleData[EXTERNAL_MODULE].subType, attr);
@@ -1787,7 +1787,7 @@ void menuModelSetup(event_t event)
         break;
 #endif
 
-#if defined(AFHDS3)
+#if defined(AFHDS3) && defined(HARDWARE_EXTERNAL_MODULE)
       case ITEM_MODEL_SETUP_EXTERNAL_MODULE_AFHDS3_RX_FREQ:
         lcdDrawText(INDENT_WIDTH, y, STR_AFHDS3_RX_FREQ);
         lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, g_model.moduleData[EXTERNAL_MODULE].afhds3.rxFreq(), attr | LEFT);
@@ -1831,7 +1831,7 @@ void menuModelSetup(event_t event)
         }
 #endif
 
-#if defined(AFHDS3)
+#if defined(AFHDS3) && defined(HARDWARE_EXTERNAL_MODULE)
       case ITEM_MODEL_SETUP_EXTERNAL_MODULE_AFHDS3_STATUS: {
         lcdDrawTextAlignedLeft(y, STR_MODULE_STATUS);
 
diff --git a/radio/src/gui/common/stdlcd/model_notes.cpp b/radio/src/gui/common/stdlcd/model_notes.cpp
index e8388043f..47b452b1b 100644
--- a/radio/src/gui/common/stdlcd/model_notes.cpp
+++ b/radio/src/gui/common/stdlcd/model_notes.cpp
@@ -25,12 +25,8 @@ void menuModelNotes(event_t event)
 {
   if (event == EVT_ENTRY) {
     strcpy(reusableBuffer.viewText.filename, MODELS_PATH "/");
-#if defined(EEPROM)
-    char *buf = strcat_modelname(&reusableBuffer.viewText.filename[sizeof(MODELS_PATH)], g_eeGeneral.currModel);
+    char *buf = strcat_currentmodelname(&reusableBuffer.viewText.filename[sizeof(MODELS_PATH)], 0);
     strcpy(buf, TEXT_EXT);
-#else
-    strcat_currentmodelname(&reusableBuffer.viewText.filename[sizeof(MODELS_PATH)]);
-#endif
   }
 
   menuTextView(event);
diff --git a/radio/src/gui/common/stdlcd/view_text.cpp b/radio/src/gui/common/stdlcd/view_text.cpp
index 5dbc23c9e..0e767e698 100644
--- a/radio/src/gui/common/stdlcd/view_text.cpp
+++ b/radio/src/gui/common/stdlcd/view_text.cpp
@@ -34,12 +34,8 @@ void readModelNotes()
   LED_ERROR_BEGIN();
 
   strcpy(reusableBuffer.viewText.filename, MODELS_PATH "/");
-#if defined(EEPROM)
-  char *buf = strcat_modelname(&reusableBuffer.viewText.filename[sizeof(MODELS_PATH)], g_eeGeneral.currModel);
+  char *buf = strcat_currentmodelname(&reusableBuffer.viewText.filename[sizeof(MODELS_PATH)], 0);
   strcpy(buf, TEXT_EXT);
-#else
-  strcat_currentmodelname(&reusableBuffer.viewText.filename[sizeof(MODELS_PATH)]);
-#endif
 
   waitKeysReleased();
   event_t event = EVT_ENTRY;