diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 6bfe155edc..fa10baf38e 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -3681,11 +3681,12 @@ Session::add_routes_inner (RouteList& new_routes, bool input_auto_connect, bool
 					r->enable_direct_outs ();
 				}
 			}
-			/* do not take `_auto_connect_queue_lock' while holding the process lock */
-			lm.release ();
-			reassign_track_numbers ();
 		}
 	}
+
+#ifdef LIVETRAX
+	reassign_track_numbers ();
+#endif
 }
 
 void
@@ -4664,7 +4665,7 @@ Session::reassign_track_numbers ()
 		}
 	}
 
-	if (Profile->get_livetrax()) {
+	if (!loading() && Profile->get_livetrax()) {
 		livetrax_queue_auto_connect ();
 	}