diff --git a/src/main/flight/navigation.c b/src/main/flight/navigation.c
index 33cc722aa..8c89dd14c 100644
--- a/src/main/flight/navigation.c
+++ b/src/main/flight/navigation.c
@@ -653,7 +653,7 @@ void updateGpsWaypointsAndMode(void)
     if (STATE(GPS_FIX) && GPS_numSat >= 5) {
         // if both GPS_HOME & GPS_HOLD are checked => GPS_HOME is the priority
         if (rcOptions[BOXGPSHOME]) {
-            if (!STATE(GPS_HOME_MODE)) {
+            if (!FLIGHT_MODE(GPS_HOME_MODE)) {
                 ENABLE_FLIGHT_MODE(GPS_HOME_MODE);
                 DISABLE_FLIGHT_MODE(GPS_HOLD_MODE);
                 GPSNavReset = 0;
@@ -661,7 +661,7 @@ void updateGpsWaypointsAndMode(void)
                 nav_mode = NAV_MODE_WP;
             }
         } else {
-            DISABLE_STATE(GPS_HOME_MODE);
+            DISABLE_FLIGHT_MODE(GPS_HOME_MODE);
 
             if (rcOptions[BOXGPSHOLD] && areSticksInApModePosition(gpsProfile->ap_mode)) {
                 if (!FLIGHT_MODE(GPS_HOLD_MODE)) {