diff --git a/src/main/fc/config.c b/src/main/fc/config.c
index 7fd015fa6..cf732f77e 100644
--- a/src/main/fc/config.c
+++ b/src/main/fc/config.c
@@ -163,6 +163,18 @@ static void validateAndFixConfig(void)
     }
 #endif
 
+    if (!isSerialConfigValid(serialConfig())) {
+        pgResetFn_serialConfig(serialConfigMutable());
+    }
+
+    if (
+#if defined(USE_GPS)
+        !findSerialPortConfig(FUNCTION_GPS) &&
+#endif
+        true) {
+        featureClear(FEATURE_GPS);
+    }
+
 #ifndef USE_OSD_SLAVE
     if (systemConfig()->activeRateProfile >= CONTROL_RATE_PROFILE_COUNT) {
         systemConfigMutable()->activeRateProfile = 0;
@@ -265,19 +277,6 @@ static void validateAndFixConfig(void)
         }
     }
 #endif
-#endif // USE_OSD_SLAVE
-
-    if (!isSerialConfigValid(serialConfig())) {
-        pgResetFn_serialConfig(serialConfigMutable());
-    }
-
-    if (
-#if defined(USE_GPS)
-        !findSerialPortConfig(FUNCTION_GPS) &&
-#endif
-        true) {
-        featureClear(FEATURE_GPS);
-    }
 
     if (
         featureConfigured(FEATURE_3D) || !featureConfigured(FEATURE_GPS)
@@ -293,6 +292,7 @@ static void validateAndFixConfig(void)
             removeModeActivationCondition(BOXGPSRESCUE);
         }
     }
+#endif // USE_OSD_SLAVE
 
 #if defined(USE_ESC_SENSOR)
     if (!findSerialPortConfig(FUNCTION_ESC_SENSOR)) {
diff --git a/src/main/target/FURYF3/target.h b/src/main/target/FURYF3/target.h
index b0ebdbf5a..c56c9a4f7 100644
--- a/src/main/target/FURYF3/target.h
+++ b/src/main/target/FURYF3/target.h
@@ -38,9 +38,9 @@
 //#undef USE_TELEMETRY_HOTT
 //#undef USE_TELEMETRY_MAVLINK
 //#undef USE_TELEMETRY_LTM
-//#undef USE_SERIALRX_XBUS
-
 #ifdef FURYF3OSD
+#undef USE_SERIALRX_XBUS
+
 #undef USE_BOARD_INFO
 #undef USE_EXTENDED_CMS_MENUS
 #undef USE_RTC_TIME