diff --git a/src/modules/config/config.h b/src/modules/config/config.h
index cfb5e2c..55ed570 100644
--- a/src/modules/config/config.h
+++ b/src/modules/config/config.h
@@ -28,6 +28,7 @@ private:
   system_logger *_logger;
   bool _valid_config;
   track_data _loaded_track;
+  bool _is_track_loaded = false;
   ring_buffer<Task, 16> _queue;
   Task _active_task = {};
   uint8_t _task_memory[64];
@@ -114,7 +115,9 @@ int config::handle_active_task(unsigned long timeout_ms) {
   switch (_active_task.type)
   {
   case TASK_CONFIG_TRACK_DETECT:
-    return task_config_detect_track(timeout_ms);
+    if (!_is_track_loaded) {
+      return task_config_detect_track(timeout_ms);
+    }
     break;
   
   default:
@@ -188,5 +191,6 @@ int config::load_track(unsigned int idx) {
   }
   _loaded_track = temp;
   track_global_write(_loaded_track); 
+  _is_track_loaded = true;
   return 0;
 }
diff --git a/src/modules/gps/gps.h b/src/modules/gps/gps.h
index 94ff417..f443759 100644
--- a/src/modules/gps/gps.h
+++ b/src/modules/gps/gps.h
@@ -65,6 +65,7 @@ int gps::loop(unsigned long timeout_ms) {
       uint32_t current_fix_val = _gps->sentencesWithFix();
       if (_last_fix_val == 0 && current_fix_val > 0) {
         router::send(MOD_LCD, TASK_DISPLAY_MSG_GPS_FIX, 2000);  
+        router::send(MOD_CFG, TASK_CONFIG_TRACK_DETECT);  
       }
       _last_fix_val = current_fix_val;
     }