diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 654234c515..f8fc5639f7 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -1955,7 +1955,10 @@ Session::location_removed (Location *location)
 {
 	if (location->is_auto_loop()) {
 		set_auto_loop_location (0);
-		set_track_loop (false);
+		if (!play_loop) {
+			set_track_loop (false);
+		}
+		unset_play_loop ();
 	}
 
 	if (location->is_auto_punch()) {
diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc
index b87a77c417..99ce3e46ed 100644
--- a/libs/ardour/session_transport.cc
+++ b/libs/ardour/session_transport.cc
@@ -1000,6 +1000,7 @@ Session::unset_play_loop ()
 			add_post_transport_work (PostTransportLocate);
 			_butler->schedule_transport_work ();
 		}
+		TransportStateChange (); /* EMIT SIGNAL */
 	}
 }