diff --git a/src/main/io/gps.c b/src/main/io/gps.c
index 294b9414297..e8975fa043d 100755
--- a/src/main/io/gps.c
+++ b/src/main/io/gps.c
@@ -399,11 +399,13 @@ void gpsProcessNewSolutionData(bool timeout)
     // Update time
     gpsUpdateTime();
 
-    // Update timeout
-    gpsSetProtocolTimeout(gpsState.baseTimeoutMs);
+    if (!timeout) {
+        // Update timeout
+        gpsSetProtocolTimeout(gpsState.baseTimeoutMs);
 
-    // Update statistics
-    gpsStats.lastMessageDt = gpsState.lastMessageMs - gpsState.lastLastMessageMs;
+        // Update statistics
+        gpsStats.lastMessageDt = gpsState.lastMessageMs - gpsState.lastLastMessageMs;
+    }
     gpsSol.flags.hasNewData = true;
 
     // Toggle heartbeat