diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc
index 84699ac718..843ae17e5f 100644
--- a/libs/ardour/session_transport.cc
+++ b/libs/ardour/session_transport.cc
@@ -582,6 +582,7 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished)
 			_requested_return_frame = -1;
 
 			if (do_locate) {
+				clear_clicks ();
 				_engine.transport_locate (_transport_frame);
 			}
 		}