diff --git a/src/gui/track_sel.cpp b/src/gui/track_sel.cpp
index aa58a1dc6..850b01840 100644
--- a/src/gui/track_sel.cpp
+++ b/src/gui/track_sel.cpp
@@ -398,7 +398,9 @@ void TrackSel::select()
     }
 
     const Track* TRACK = track_manager->getTrack(m_index_avail_tracks[track_number]);
-    user_config->m_last_track = TRACK->getIdent();
+    // Only save the last track if it's not in battle mode.
+    if(!RaceManager::isBattleMode(race_manager->getMinorMode()))
+        user_config->m_last_track = TRACK->getIdent();
     bool isAvailable = !unlock_manager->isLocked(TRACK->getIdent());
 
     if( isAvailable )