diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc
index 0def70a4dc..eab9e36097 100644
--- a/libs/ardour/session_transport.cc
+++ b/libs/ardour/session_transport.cc
@@ -1397,9 +1397,10 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished)
 				 * auto-return enabled
 				 */
 
-				_transport_sample = _last_roll_location;
-				do_locate = true;
-
+				if (_last_roll_location >= 0) {
+					_transport_sample = _last_roll_location;
+					do_locate = true;
+				}
 			}
 		}