diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc
index ed5d590e60..04ba86902c 100644
--- a/libs/ardour/session_transport.cc
+++ b/libs/ardour/session_transport.cc
@@ -250,7 +250,7 @@ Session::locate (samplepos_t target_sample, bool with_roll, bool with_flush, boo
 		}
 	}
 
-	if (force) {
+	if (force || !for_loop_end) {
 
 		PostTransportWork todo = PostTransportLocate;