diff --git a/radio/src/gui/menu_general.cpp b/radio/src/gui/menu_general.cpp
index a40969365..d9fbca2f5 100644
--- a/radio/src/gui/menu_general.cpp
+++ b/radio/src/gui/menu_general.cpp
@@ -158,11 +158,11 @@ enum menuGeneralSetupItems {
   IF_CPUARM(ITEM_SETUP_BACKGROUND_VOLUME)
   ITEM_SETUP_BEEP_LENGTH,
   IF_AUDIO(ITEM_SETUP_SPEAKER_PITCH)
-  IF_CPUARM(ITEM_SETUP_VARIO_LABEL)
-  IF_CPUARM(ITEM_SETUP_VARIO_VOLUME)
-  IF_CPUARM(ITEM_SETUP_VARIO_PITCH)
-  IF_CPUARM(ITEM_SETUP_VARIO_RANGE)
-  IF_CPUARM(ITEM_SETUP_VARIO_REPEAT)
+  IF_VARIO_CPUARM(ITEM_SETUP_VARIO_LABEL)
+  IF_VARIO_CPUARM(ITEM_SETUP_VARIO_VOLUME)
+  IF_VARIO_CPUARM(ITEM_SETUP_VARIO_PITCH)
+  IF_VARIO_CPUARM(ITEM_SETUP_VARIO_RANGE)
+  IF_VARIO_CPUARM(ITEM_SETUP_VARIO_REPEAT)
   IF_HAPTIC(ITEM_SETUP_HAPTIC_LABEL)
   IF_HAPTIC(ITEM_SETUP_HAPTIC_MODE)
   IF_HAPTIC(ITEM_SETUP_HAPTIC_LENGTH)
@@ -219,7 +219,7 @@ void menuGeneralSetup(uint8_t event)
   }
 #endif
 
-  MENU(STR_MENURADIOSETUP, menuTabDiag, e_Setup, ITEM_SETUP_MAX+1, {0, IF_RTCLOCK(2) IF_RTCLOCK(2) IF_BATTGRAPH(1) LABEL(SOUND), IF_AUDIO(0) IF_BUZZER(0) IF_VOICE(0) IF_CPUARM(0) IF_CPUARM(0) IF_CPUARM(0) 0, IF_AUDIO(0) IF_CPUARM(LABEL(VARIO)) IF_CPUARM(0) IF_CPUARM(0) IF_CPUARM(0) IF_CPUARM(0) IF_HAPTIC(LABEL(HAPTIC)) IF_HAPTIC(0) IF_HAPTIC(0) IF_HAPTIC(0) 0, LABEL(ALARMS), 0, CASE_PCBSKY9X(0) CASE_PCBSKY9X(0) 0, 0, 0, IF_ROTARY_ENCODERS(0) LABEL(BACKLIGHT), 0, 0, IF_CPUARM(0) CASE_PWM_BACKLIGHT(0) CASE_PWM_BACKLIGHT(0) 0, IF_SPLASH_PARAM(0) IF_GPS(0) IF_GPS(0) IF_PXX(0) IF_CPUARM(0) IF_CPUARM(0) IF_FAI_CHOICE(0) 0, LABEL(TX_MODE), CASE_PCBTARANIS(0) 1/*to force edit mode*/});
+  MENU(STR_MENURADIOSETUP, menuTabDiag, e_Setup, ITEM_SETUP_MAX+1, {0, IF_RTCLOCK(2) IF_RTCLOCK(2) IF_BATTGRAPH(1) LABEL(SOUND), IF_AUDIO(0) IF_BUZZER(0) IF_VOICE(0) IF_CPUARM(0) IF_CPUARM(0) IF_CPUARM(0) 0, IF_AUDIO(0) IF_VARIO_CPUARM(LABEL(VARIO)) IF_VARIO_CPUARM(0) IF_VARIO_CPUARM(0) IF_VARIO_CPUARM(0) IF_VARIO_CPUARM(0) IF_HAPTIC(LABEL(HAPTIC)) IF_HAPTIC(0) IF_HAPTIC(0) IF_HAPTIC(0) 0, LABEL(ALARMS), 0, CASE_PCBSKY9X(0) CASE_PCBSKY9X(0) 0, 0, 0, IF_ROTARY_ENCODERS(0) LABEL(BACKLIGHT), 0, 0, IF_CPUARM(0) CASE_PWM_BACKLIGHT(0) CASE_PWM_BACKLIGHT(0) 0, IF_SPLASH_PARAM(0) IF_GPS(0) IF_GPS(0) IF_PXX(0) IF_CPUARM(0) IF_CPUARM(0) IF_FAI_CHOICE(0) 0, LABEL(TX_MODE), CASE_PCBTARANIS(0) 1/*to force edit mode*/});
 
   uint8_t sub = m_posVert - 1;
 
@@ -384,7 +384,7 @@ void menuGeneralSetup(uint8_t event)
         break;
 #endif
 
-#if defined(CPUARM)
+#if defined(CPUARM) && defined(VARIO)
       case ITEM_SETUP_VARIO_LABEL:
         lcd_putsLeft(y, STR_VARIO);
         break;
diff --git a/radio/src/maths.cpp b/radio/src/maths.cpp
index 2cd8597f4..b45ab3655 100644
--- a/radio/src/maths.cpp
+++ b/radio/src/maths.cpp
@@ -137,7 +137,7 @@ void getGpsDistance()
 }
 #endif
 
-#if defined(CPUARM)
+#if defined(CPUARM) && defined(VARIO)
 
 void varioWakeup()
 {
diff --git a/radio/src/opentx.h b/radio/src/opentx.h
index 6ad817145..947aa1988 100644
--- a/radio/src/opentx.h
+++ b/radio/src/opentx.h
@@ -72,6 +72,12 @@
 #define IF_CPUARM(x)
 #endif
 
+#if defined(VARIO) && defined(CPUARM)
+#define IF_VARIO_CPUARM(x) x,
+#else
+#define IF_VARIO_CPUARM(x)
+#endif
+
 #if defined(LUA)
 #define IF_LUA(x) x,
 #else