diff --git a/src/gps/GPS.cpp b/src/gps/GPS.cpp
index 8f2ce35d0..8436c3f60 100644
--- a/src/gps/GPS.cpp
+++ b/src/gps/GPS.cpp
@@ -661,6 +661,8 @@ bool GPS::setupGPS()
                 if (getACK(0x06, 0x86, 300) != GNSS_RESPONSE_OK) {
                     LOG_WARN("Unable to enable powersaving for GPS.\n");
                 }
+            } else {
+                // use cfg-rxm
             }
             // We need save configuration to flash to make our config changes persistent
             uint8_t _message_SAVE[21] = {
@@ -721,7 +723,6 @@ bool GPS::setup()
 
     if (config.position.gps_enabled == false && config.position.fixed_position == false) {
         setAwake(false);
-        doGPSpowersave(false);
     }
     return ok;
 }
diff --git a/src/main.cpp b/src/main.cpp
index 09fa62896..3ca3b50f3 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -562,6 +562,9 @@ void setup()
 
     if (gps) {
         gpsStatus->observe(&gps->newStatus);
+        if (config.position.gps_enabled == false && config.position.fixed_position == false) {
+            doGPSpowersave(false);
+        }
     } else {
         LOG_WARN("No GPS found - running without GPS\n");
     }