diff --git a/src/main/target/OMNIBUS/target.h b/src/main/target/OMNIBUS/target.h
index 4200b61b82..bde8cd793c 100644
--- a/src/main/target/OMNIBUS/target.h
+++ b/src/main/target/OMNIBUS/target.h
@@ -58,6 +58,8 @@
 //#define SONAR_ECHO_PIN          PB1
 //#define SONAR_TRIGGER_PIN       PB0
 
+#undef GPS
+
 #define USB_IO
 #define USB_CABLE_DETECTION
 #define USB_DETECT_PIN          PB5
diff --git a/src/main/target/SPRACINGF3NEO/target.h b/src/main/target/SPRACINGF3NEO/target.h
index 565afa796b..c20cd7d3ae 100755
--- a/src/main/target/SPRACINGF3NEO/target.h
+++ b/src/main/target/SPRACINGF3NEO/target.h
@@ -168,6 +168,7 @@
 
 #define OSD
 
+#undef GPS
 
 #define DEFAULT_RX_FEATURE      FEATURE_RX_PPM
 #define DEFAULT_FEATURES        (FEATURE_TRANSPONDER | FEATURE_BLACKBOX | FEATURE_RSSI_ADC | FEATURE_CURRENT_METER | FEATURE_TELEMETRY | FEATURE_OSD)
@@ -193,4 +194,3 @@
 
 #define USABLE_TIMER_CHANNEL_COUNT 12 // 2xPPM, 6xPWM, UART3 RX/TX, LED Strip, IR.
 #define USED_TIMERS  (TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(8) | TIM_N(15) | TIM_N(16))
-
diff --git a/src/main/target/common.h b/src/main/target/common.h
index 66d17911a4..b0d84b5614 100644
--- a/src/main/target/common.h
+++ b/src/main/target/common.h
@@ -43,7 +43,6 @@
 #define STM_FAST_TARGET
 #define USE_DSHOT
 #define I2C3_OVERCLOCK true
-#define GPS
 #endif
 
 #ifdef STM32F3
@@ -82,6 +81,7 @@
 
 #if (FLASH_SIZE > 64)
 #define BLACKBOX
+#define GPS
 #define TELEMETRY
 #define TELEMETRY_FRSKY
 #define TELEMETRY_HOTT