diff --git a/radio/src/CMakeLists.txt b/radio/src/CMakeLists.txt
index 11c90840b..2cae9c198 100644
--- a/radio/src/CMakeLists.txt
+++ b/radio/src/CMakeLists.txt
@@ -16,7 +16,7 @@ set_property(CACHE PPM_UNIT PROPERTY STRINGS US PERCENT_PREC1 PERCENT_PREC0)
 set(DEFAULT_MODE "" CACHE STRING "Default sticks mode")
 set(FONT "STD" CACHE STRING "Choose font : STD or SQT5")
 set_property(CACHE FONT PROPERTY STRINGS SQT5)
-set(POPUP_LEVEL 3 CACHE INT "Popup level")
+set(POPUP_LEVEL 2 CACHE INT "Popup level")
 
 option(HELI "Heli menu" ON)
 option(FLIGHT_MODES "Flight Modes" ON)
@@ -315,6 +315,7 @@ endif()
 
 if(FRSKY_RELEASE)
   add_definitions(-DFRSKY_RELEASE)
+    set(POPUP_LEVEL 3)
 endif()
 
 add_definitions(-DPOPUP_LEVEL=${POPUP_LEVEL})
diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp
index abf9a9bda..6d6d084b8 100644
--- a/radio/src/gui/128x64/model_setup.cpp
+++ b/radio/src/gui/128x64/model_setup.cpp
@@ -910,6 +910,7 @@ void menuModelSetup(event_t event)
                 }
             }
           }
+#if POPUP_LEVEL > 1
           else if (old_editMode > 0) {
             if (isModuleR9MNonAccess(EXTERNAL_MODULE)) {
               if (g_model.moduleData[EXTERNAL_MODULE].subType > MODULE_SUBTYPE_R9M_EU) {
@@ -928,6 +929,7 @@ void menuModelSetup(event_t event)
 #endif
             }
           }
+#endif
         }
         break;
 
diff --git a/radio/src/gui/212x64/model_setup.cpp b/radio/src/gui/212x64/model_setup.cpp
index f99e0d359..24e954a47 100644
--- a/radio/src/gui/212x64/model_setup.cpp
+++ b/radio/src/gui/212x64/model_setup.cpp
@@ -883,12 +883,14 @@ void menuModelSetup(event_t event)
 #endif
             }
           }
+#if POPUP_LEVEL > 1          
           else if (old_editMode > 0) {
             if (isModuleR9MNonAccess(EXTERNAL_MODULE)) {
               if (g_model.moduleData[EXTERNAL_MODULE].subType > MODULE_SUBTYPE_R9M_EU) {
                 POPUP_WARNING(STR_R9M_PROTO_FLEX_WARN_LINE1);
                 SET_WARNING_INFO(STR_R9M_PROTO_WARN_LINE2, sizeof(TR_R9M_PROTO_WARN_LINE2) - 1, 0);
               }
+#if POPUP_LEVEL >= 3              
               else if (g_model.moduleData[EXTERNAL_MODULE].subType == MODULE_SUBTYPE_R9M_EU) {
                 POPUP_WARNING(STR_R9M_PROTO_EU_WARN_LINE1);
                 SET_WARNING_INFO(STR_R9M_PROTO_WARN_LINE2, sizeof(TR_R9M_PROTO_WARN_LINE2) - 1, 0);
@@ -897,8 +899,10 @@ void menuModelSetup(event_t event)
                 POPUP_WARNING(STR_R9M_PROTO_FCC_WARN_LINE1);
                 SET_WARNING_INFO(STR_R9M_PROTO_WARN_LINE2, sizeof(TR_R9M_PROTO_WARN_LINE2) - 1, 0);
               }
+#endif              
             }
           }
+#endif          
         }
         break;
 
diff --git a/radio/src/gui/480x272/model_setup.cpp b/radio/src/gui/480x272/model_setup.cpp
index 67434c5bd..a86e0e790 100644
--- a/radio/src/gui/480x272/model_setup.cpp
+++ b/radio/src/gui/480x272/model_setup.cpp
@@ -1107,6 +1107,26 @@ bool menuModelSetup(event_t event)
 #endif
             }
           }
+#if POPUP_LEVEL > 1
+          else if (old_editMode > 0) {
+            if (isModuleR9MNonAccess(EXTERNAL_MODULE)) {
+              if (g_model.moduleData[EXTERNAL_MODULE].subType > MODULE_SUBTYPE_R9M_EU) {
+                POPUP_WARNING(STR_R9M_PROTO_FLEX_WARN_LINE1);
+                SET_WARNING_INFO(STR_R9M_PROTO_WARN_LINE2, sizeof(TR_R9M_PROTO_WARN_LINE2) - 1, 0);
+              }
+#if POPUP_LEVEL >= 3
+              else if (g_model.moduleData[EXTERNAL_MODULE].subType == MODULE_SUBTYPE_R9M_EU) {
+                POPUP_WARNING(STR_R9M_PROTO_EU_WARN_LINE1);
+                SET_WARNING_INFO(STR_R9M_PROTO_WARN_LINE2, sizeof(TR_R9M_PROTO_WARN_LINE2) - 1, 0);
+              }
+              else {
+                POPUP_WARNING(STR_R9M_PROTO_FCC_WARN_LINE1);
+                SET_WARNING_INFO(STR_R9M_PROTO_WARN_LINE2, sizeof(TR_R9M_PROTO_WARN_LINE2) - 1, 0);
+              }
+#endif
+            }
+          }
+#endif          
         }
         break;