diff --git a/src/states_screens/edit_track_screen.cpp b/src/states_screens/edit_track_screen.cpp
index ed2667c2d..c3b68fe29 100644
--- a/src/states_screens/edit_track_screen.cpp
+++ b/src/states_screens/edit_track_screen.cpp
@@ -234,7 +234,9 @@ void EditTrackScreen::selectTrack(const std::string& id)
         tracks->setSelection("", PLAYER_ID_GAME_MASTER, true);
         selected_track->setText(_("Select a track"), true);
 
-        laps->setValue(m_track->getDefaultNumberOfLaps());
+        // We can't set a better default for number of laps. On the other
+        // hand, if a track is selected, the number of laps will be updated.
+        laps->setValue(3);
 
         reverse->setVisible(true);
         reverse->setState(false);