diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index e9000560c3..8f29f7b8e9 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -2840,6 +2840,11 @@ what you would like to do.\n"), PROGRAM_NAME));
 void
 ARDOUR_UI::store_clock_modes ()
 {
+	if (session_load_in_progress) {
+		/* Do not overwrite clock modes while loading them (with a session) */
+		return;
+	}
+
 	XMLNode* node = new XMLNode(X_("ClockModes"));
 
 	for (vector<AudioClock*>::iterator x = AudioClock::clocks.begin(); x != AudioClock::clocks.end(); ++x) {