diff --git a/libs/ardour/location.cc b/libs/ardour/location.cc
index 579a0e2820..b46972ef2e 100644
--- a/libs/ardour/location.cc
+++ b/libs/ardour/location.cc
@@ -578,7 +578,10 @@ Locations::set_state (const XMLNode& node)
 	}
 	
 	nlist = node.children();
-	
+
+	locations.clear (); // dangerous
+	current_location = 0;
+
 	{
 		Glib::Mutex::Lock lm (lock);