diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc
index 317304eb11..62f73193ed 100644
--- a/libs/ardour/session_transport.cc
+++ b/libs/ardour/session_transport.cc
@@ -766,11 +766,11 @@ Session::butler_completed_transport_work ()
 
 	bool start_after_butler_done_msg = false;
 
-	if (ptw & PostTransportReverse) {
+	if ((ptw & (PostTransportReverse|PostTransportRoll))) {
 		start_after_butler_done_msg = true;
 	}
 
-	ptw = PostTransportWork (ptw & ~(PostTransportAdjustCaptureBuffering|PostTransportOverWrite|PostTransportReverse));
+	ptw = PostTransportWork (ptw & ~(PostTransportAdjustCaptureBuffering|PostTransportOverWrite|PostTransportReverse|PostTransportRoll));
 	set_post_transport_work (ptw);
 
 	set_next_event ();
@@ -855,6 +855,8 @@ Session::set_play_loop (bool yn, double speed)
 	ENSURE_PROCESS_THREAD;
 	/* Called from event-handling context */
 
+	DEBUG_TRACE (DEBUG::Transport, string_compose ("set_play_loop (%1, %2)\n", yn, speed));
+
 	Location *loc;
 
 	if (yn == play_loop || (actively_recording() && yn) || (loc = _locations->auto_loop_location()) == 0) {