diff --git a/gtk2_ardour/shuttle_control.cc b/gtk2_ardour/shuttle_control.cc
index 7c52ddcf13..e63960d66e 100644
--- a/gtk2_ardour/shuttle_control.cc
+++ b/gtk2_ardour/shuttle_control.cc
@@ -340,7 +340,11 @@ ShuttleControl::on_button_release_event (GdkEventButton* ev)
 			gdk_pointer_ungrab (GDK_CURRENT_TIME);
 
 			if (Config->get_shuttle_behaviour() == Sprung) {
-				_session->reset_transport_speed();
+				if (shuttle_speed_on_grab == 0 ) {
+					_session->request_stop ();
+				} else {
+					_session->request_transport_speed (shuttle_speed_on_grab);
+				}
 			} else {
 				mouse_shuttle (ev->x, true);
 			}