diff --git a/libs/surfaces/push2/push2.cc b/libs/surfaces/push2/push2.cc
index 1ea1fe33b8..e9fa2784cc 100644
--- a/libs/surfaces/push2/push2.cc
+++ b/libs/surfaces/push2/push2.cc
@@ -192,6 +192,8 @@ Push2::~Push2 ()
 {
 	DEBUG_TRACE (DEBUG::Push2, "push2 control surface object being destroyed\n");
 
+	stop_event_loop ();
+
 	MIDISurface::drop ();
 
 	if (_current_layout) {
@@ -209,11 +211,8 @@ Push2::~Push2 ()
 	_track_mix_layout = 0;
 	delete _cue_layout;
 	_cue_layout = 0;
-
-	stop_event_loop ();
 }
 
-
 void
 Push2::run_event_loop ()
 {