diff --git a/src/main/io/gps.c b/src/main/io/gps.c
index 70b582a4a7..dca20944c3 100755
--- a/src/main/io/gps.c
+++ b/src/main/io/gps.c
@@ -435,7 +435,7 @@ void gpsUpdate(timeUs_t currentTimeUs)
                 gpsData.baudrateIndex++;
                 gpsData.baudrateIndex %= GPS_INIT_ENTRIES;
             }
-            gpsData.lastMessage = currentTimeUs / 1000;
+            gpsData.lastMessage = millis();
             // TODO - move some / all of these into gpsData
             GPS_numSat = 0;
             DISABLE_STATE(GPS_FIX);
@@ -444,7 +444,7 @@ void gpsUpdate(timeUs_t currentTimeUs)
 
         case GPS_RECEIVING_DATA:
             // check for no data/gps timeout/cable disconnection etc
-            if (currentTimeUs / 1000 - gpsData.lastMessage > GPS_TIMEOUT) {
+            if (millis() - gpsData.lastMessage > GPS_TIMEOUT) {
                 // remove GPS from capability
                 sensorsClear(SENSOR_GPS);
                 gpsSetState(GPS_LOST_COMMUNICATION);