diff --git a/libs/surfaces/mackie/surface.cc b/libs/surfaces/mackie/surface.cc
index 98ad7981ee..e4559de794 100644
--- a/libs/surfaces/mackie/surface.cc
+++ b/libs/surfaces/mackie/surface.cc
@@ -391,13 +391,16 @@ Surface::setup_master ()
 
 	if (!_master_fader) {
 		Groups::iterator group_it;
+		Group* master_group;
 		group_it = groups.find("master");
 
 		if (group_it == groups.end()) {
-			groups["master"] = new Group ("master");
+			groups["master"] = master_group = new Group ("master");
+		} else {
+			master_group = group_it->second;
 		}
 
-		_master_fader = dynamic_cast<Fader*> (Fader::factory (*this, _mcp.device_info().strip_cnt(), "master", *group_it->second));
+		_master_fader = dynamic_cast<Fader*> (Fader::factory (*this, _mcp.device_info().strip_cnt(), "master", *master_group));
 
 		DeviceInfo device_info = _mcp.device_info();
 		GlobalButtonInfo master_button = device_info.get_global_button(Button::MasterFaderTouch);