diff --git a/src/gps/GPSUpdateScheduling.cpp b/src/gps/GPSUpdateScheduling.cpp
index 5eaf7a8ba..1056699cf 100644
--- a/src/gps/GPSUpdateScheduling.cpp
+++ b/src/gps/GPSUpdateScheduling.cpp
@@ -81,6 +81,10 @@ bool GPSUpdateScheduling::searchedTooLong()
     else if (elapsedSearchMs() > maxSearchMs)
         return true;
 
+    // Anything over 15 minutes is too long. TODO: Make a smarter algorithm that backs off the search dwell time when not getting a lock.
+    else if (elapsedSearchMs() > 1000 * 60 * 15)
+        return true;
+
     // Otherwise, not too long yet!
     else
         return false;