diff --git a/src/gps/GPS.cpp b/src/gps/GPS.cpp
index 9fab136d2..ab09d7e05 100644
--- a/src/gps/GPS.cpp
+++ b/src/gps/GPS.cpp
@@ -1123,15 +1123,11 @@ int32_t GPS::runOnce()
         hasValidLocation = true;
         shouldPublish = true;
         // Hold for 20secs after getting a lock to download ephemeris etc
-        lastFixStartMsec = millis();
-        fixHoldEnds = lastFixStartMsec + 20000;
+        fixHoldEnds = millis() + 20000;
     }
 
-    if (gotLoc && prev_fixQual == 0) { // we've moved from no lock to lock
-        LOG_DEBUG("Probably just got a lock after turning back on.");
-        // Hold for 20secs after getting a lock to download ephemeris etc
-        lastFixStartMsec = millis();
-        fixHoldEnds = lastFixStartMsec + 20000;
+    if (gotLoc && prev_fixQual == 0) { // just got a lock after turning back on.
+        fixHoldEnds = millis() + 20000;
         shouldPublish = true; // Publish immediately, since next publish is at end of hold
     }
 
diff --git a/src/gps/GPS.h b/src/gps/GPS.h
index 3dcb17611..177cfe74b 100644
--- a/src/gps/GPS.h
+++ b/src/gps/GPS.h
@@ -159,7 +159,7 @@ class GPS : private concurrency::OSThread
     uint8_t fixType = 0;      // fix type from GPGSA
 #endif
 
-    uint32_t lastFixStartMsec = 0, fixHoldEnds = 0;
+    uint32_t fixHoldEnds = 0;
     uint32_t rx_gpio = 0;
     uint32_t tx_gpio = 0;