diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc
index 300388acea..7660784797 100644
--- a/libs/ardour/session_transport.cc
+++ b/libs/ardour/session_transport.cc
@@ -585,7 +585,9 @@ Session::start_transport ()
 
 	_last_roll_location = _transport_sample;
 	_last_roll_or_reversal_location = _transport_sample;
-	_remaining_latency_preroll = worst_latency_preroll_buffer_size_ceil ();
+	if (!have_looped) {
+		_remaining_latency_preroll = worst_latency_preroll_buffer_size_ceil ();
+	}
 
 	have_looped = false;