diff --git a/libs/ardour/transport_fsm.cc b/libs/ardour/transport_fsm.cc
index 8e3ef98cfa..26de519db1 100644
--- a/libs/ardour/transport_fsm.cc
+++ b/libs/ardour/transport_fsm.cc
@@ -418,7 +418,10 @@ TransportFSM::compute_should_roll (LocateTransportDisposition ltd) const
 	case MustStop:
 		return false;
 	case RollIfAppropriate:
-		if (rolling()) {
+		/* by the time we call this, if we were rolling before the
+		   locate, we've already transitioned into DeclickToLocate
+		*/
+		if (_motion_state == DeclickToLocate) {
 			return true;
 		} else {
 			return api->should_roll_after_locate ();