diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc
index 9e8a66481b..4413bddeb7 100644
--- a/libs/surfaces/mackie/mackie_control_protocol.cc
+++ b/libs/surfaces/mackie/mackie_control_protocol.cc
@@ -255,8 +255,7 @@ struct mcpStripableSorter
 {
 	bool operator () (const std::shared_ptr<Stripable> & a, const std::shared_ptr<Stripable> & b) const
 	{
-		if (!(a->is_monitor() || b->is_monitor() ||
-		      a->is_master() || b->is_master() ||
+		if (!(a->presentation_info().special() || b->presentation_info().special() ||
 		      a->is_foldbackbus() || b->is_foldbackbus())) {
 			return a->presentation_info().order() < b->presentation_info().order();
 		}
@@ -264,12 +263,14 @@ struct mcpStripableSorter
 		int cmp_a = 0;
 		int cmp_b = 0;
 
-		if (a->is_foldbackbus()) { cmp_a = 1; }
-		if (b->is_foldbackbus()) { cmp_b = 1; }
-		if (a->is_master ())     { cmp_a = 2; }
-		if (b->is_master ())     { cmp_b = 2; }
-		if (a->is_monitor ())    { cmp_a = 3; }
-		if (b->is_monitor ())    { cmp_b = 3; }
+		if (a->is_foldbackbus ())     { cmp_a = 1; }
+		if (b->is_foldbackbus ())     { cmp_b = 1; }
+		if (a->is_master ())          { cmp_a = 2; }
+		if (b->is_master ())          { cmp_b = 2; }
+		if (a->is_monitor ())         { cmp_a = 3; }
+		if (b->is_monitor ())         { cmp_b = 3; }
+		if (a->is_surround_master ()) { cmp_a = 4; }
+		if (b->is_surround_master ()) { cmp_b = 4; }
 
 		if (cmp_a == cmp_b) {
 			return a->presentation_info().order() < b->presentation_info().order();