diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 2936d6468a..83664f2c03 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -614,14 +614,14 @@ Session::destroy ()
 	Port::PortSignalDrop (); /* EMIT SIGNAL */
 	drop_connections ();
 
+	/* stop auto dis/connecting */
+	auto_connect_thread_terminate ();
+
 	/* shutdown control surface protocols while we still have ports
 	 * and the engine to move data to any devices.
 	 */
 	ControlProtocolManager::instance().drop_protocols ();
 
-	/* stop auto dis/connecting */
-	auto_connect_thread_terminate ();
-
 	_engine.remove_session ();
 
 	/* deregister all ports - there will be no process or any other