diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc
index 20a09a04c0..6658c49cd9 100644
--- a/libs/ardour/session_transport.cc
+++ b/libs/ardour/session_transport.cc
@@ -481,7 +481,15 @@ Session::select_playhead_priority_target (framepos_t& jump_to)
 	if (jump_to < 0 && (autoreturn & RangeSelectionStart)) {
 		if (!_range_selection.empty()) {
 			jump_to = _range_selection.from;
-		}
+		} else {
+                        if (transport_rolling()) {
+                                /* Range selection no longer exists, but we're playing, 
+                                   so do nothing. Next stop will put us where
+                                   we need to be.
+                                */
+                                return false;
+                        }
+                }
 	}
 	
 	if (jump_to < 0 && (autoreturn & Loop)) {