diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc
index 7a48cf8fd0..c3ad65b363 100644
--- a/libs/surfaces/mackie/mackie_control_protocol.cc
+++ b/libs/surfaces/mackie/mackie_control_protocol.cc
@@ -610,7 +610,7 @@ MackieControlProtocol::update_global_button (int id, LedState ls)
 	{
 		Glib::Threads::Mutex::Lock lm (surfaces_lock);
 
-		if (surfaces.empty()) {
+		if (!_master_surface) {
 			return;
 		}
 
@@ -694,6 +694,10 @@ MackieControlProtocol::initialize()
 			return;
 		}
 
+		if (!_master_surface) {
+			return;
+		}
+
 		if (!_master_surface->active ()) {
 			return;
 		}