diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 544906fd2e..073ad07961 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -500,14 +500,6 @@ Session::immediately_post_engine ()
 
 	_engine.Running.connect_same_thread (*this, boost::bind (&Session::engine_running, this));
 
-	if (synced_to_engine()) {
-		_engine.transport_stop ();
-	}
-
-	if (config.get_jack_time_master()) {
-		_engine.transport_locate (_transport_sample);
-	}
-
 	try {
 		BootMessage (_("Set up LTC"));
 		setup_ltc ();
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index ea78133c86..51a057abf2 100644
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -369,6 +369,12 @@ Session::post_engine_init ()
 		_locations->removed.connect_same_thread (*this, boost::bind (&Session::location_removed, this, _1));
 		_locations->changed.connect_same_thread (*this, boost::bind (&Session::locations_changed, this));
 
+		if (synced_to_engine()) {
+			_engine.transport_stop ();
+		}
+
+		// send_full_time_code (0);
+
 	} catch (AudioEngine::PortRegistrationFailure& err) {
 		error << err.what() << endmsg;
 		return -5;
@@ -382,9 +388,6 @@ Session::post_engine_init ()
 
 	BootMessage (_("Reset Remote Controls"));
 
-	// send_full_time_code (0);
-	_engine.transport_locate (0);
-
 	send_immediate_mmc (MIDI::MachineControlCommand (MIDI::MachineControl::cmdMmcReset));
 	send_immediate_mmc (MIDI::MachineControlCommand (Timecode::Time ()));