diff --git a/Tools/AntennaTracker/system.pde b/Tools/AntennaTracker/system.pde
index 03c6be0ae81f53d0fb507222e9d694d203560511..75ea860f1288dd8faa929803de9f79ba634fdb2f 100644
--- a/Tools/AntennaTracker/system.pde
+++ b/Tools/AntennaTracker/system.pde
@@ -83,7 +83,9 @@ static void init_tracker()
     current_loc.lng = g.start_longitude * 1.0e7f;
 
     // see if EEPROM has a default location as well
-    get_home_eeprom(current_loc);
+    if (current_loc.lat == 0 && current_loc.lng == 0) {
+        get_home_eeprom(current_loc);
+    }
 
     gcs_send_text_P(SEVERITY_LOW,PSTR("\nReady to track."));
     hal.scheduler->delay(1000); // Why????