diff --git a/libs/ardour/transport_fsm.cc b/libs/ardour/transport_fsm.cc
index f80f6e7a90..00645c8905 100644
--- a/libs/ardour/transport_fsm.cc
+++ b/libs/ardour/transport_fsm.cc
@@ -400,7 +400,7 @@ TransportFSM::start_locate_while_stopped (Event const & l) const
 	assert (l.type == Locate);
 	DEBUG_TRACE (DEBUG::TFSMEvents, "start_locate_while_stopped\n");
 
-	current_roll_after_locate_status = api->should_roll_after_locate();
+	current_roll_after_locate_status = l.with_roll ? true : api->should_roll_after_locate();
 	api->locate (l.target, current_roll_after_locate_status.get(), l.with_flush, l.with_loop, l.force);
 }