diff --git a/radio/src/gui/menu_general.cpp b/radio/src/gui/menu_general.cpp
index 2e1f9777f..c046506f7 100644
--- a/radio/src/gui/menu_general.cpp
+++ b/radio/src/gui/menu_general.cpp
@@ -139,6 +139,12 @@ const MenuFuncP_PROGMEM menuTabDiag[] PROGMEM = {
   #define displaySlider(x, y, value, max, attr) lcd_outdezAtt(x, y, value, attr|LEFT)
 #endif
 
+#if defined(SPLASH) && !defined(FSPLASH)
+  #define IF_SPLASH_PARAM(x) x,
+#else
+  #define IF_SPLASH_PARAM(x)
+#endif
+
 enum menuGeneralSetupItems {
   IF_RTCLOCK(ITEM_SETUP_DATE)
   IF_RTCLOCK(ITEM_SETUP_TIME)
@@ -177,9 +183,7 @@ enum menuGeneralSetupItems {
   CASE_PWM_BACKLIGHT(ITEM_SETUP_BACKLIGHT_BRIGHTNESS_OFF)
   CASE_PWM_BACKLIGHT(ITEM_SETUP_BACKLIGHT_BRIGHTNESS_ON)
   ITEM_SETUP_FLASH_BEEP,
-#if defined(SPLASH) && !defined(FSPLASH)
-  ITEM_SETUP_DISABLE_SPLASH,
-#endif
+  IF_SPLASH_PARAM(ITEM_SETUP_DISABLE_SPLASH)
   IF_GPS(ITEM_SETUP_TIMEZONE)
   IF_GPS(ITEM_SETUP_GPSFORMAT)
   IF_PXX(ITEM_SETUP_COUNTRYCODE)
@@ -215,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(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_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*/});
 
   uint8_t sub = m_posVert - 1;
 
diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h
index fa67c8575..514f730fb 100644
--- a/radio/src/myeeprom.h
+++ b/radio/src/myeeprom.h
@@ -337,7 +337,7 @@ enum BacklightMode {
   e_backlight_mode_on
 };
 
-#if defined(FSPLASH) || defined(XSPLASH)
+#if defined(FSPLASH)
   #define SPLASH_MODE uint8_t splashMode:3
 #else
   #define SPLASH_MODE uint8_t splashMode:1; uint8_t spare4:2
diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index 46d81cb8f..02ea5ec12 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -2290,7 +2290,7 @@ void doSplash()
 
       getADC();
 
-#if defined(FSPLASH) || defined(XSPLASH)
+#if defined(FSPLASH)
       if (!(g_eeGeneral.splashMode & 0x04))
 #endif
       if (keyDown() || inputsMoved()) return;
diff --git a/radio/src/opentx.h b/radio/src/opentx.h
index a22dd9aed..672008c58 100644
--- a/radio/src/opentx.h
+++ b/radio/src/opentx.h
@@ -523,7 +523,7 @@ enum BaseCurves {
 
 #define THRCHK_DEADBAND 16
 
-#if defined(FSPLASH) || defined(XSPLASH)
+#if defined(FSPLASH)
   #define SPLASH_TIMEOUT  (g_eeGeneral.splashMode == 0 ? 60000/*infinite=10mn*/ : ((4*100) * (g_eeGeneral.splashMode & 0x03)))
 #else
   #define SPLASH_TIMEOUT  (4*100)  // 4 seconds