diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 746732f76e..b2b98e7b8c 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -276,6 +276,10 @@ Session::Session (AudioEngine &eng,
 			throw failed_constructor ();
 		}
 
+		if (load_state (_current_snapshot_name)) {
+			throw failed_constructor ();
+		}
+
 	} else {
 
 		if (load_state (_current_snapshot_name)) {