diff --git a/libs/surfaces/control_protocol/basic_ui.cc b/libs/surfaces/control_protocol/basic_ui.cc
index 6ec3fb0003..aa13060b35 100644
--- a/libs/surfaces/control_protocol/basic_ui.cc
+++ b/libs/surfaces/control_protocol/basic_ui.cc
@@ -535,9 +535,7 @@ void
 BasicUI::cancel_all_solo ()
 {
 	if (session) {
-		StripableList sl;
-		session->get_stripables (sl);
-		session->set_controls (stripable_list_to_control_list (sl, &Stripable::solo_control), 0.0, PBD::Controllable::NoGroup);
+		session->cancel_all_solo ();
 	}
 }
 
diff --git a/libs/surfaces/mackie/mcp_buttons.cc b/libs/surfaces/mackie/mcp_buttons.cc
index 4733327d2c..5f3d2766c8 100644
--- a/libs/surfaces/mackie/mcp_buttons.cc
+++ b/libs/surfaces/mackie/mcp_buttons.cc
@@ -887,9 +887,7 @@ MackieControlProtocol::clearsolo_press (Mackie::Button&)
 		return none;
 	}
 
-	if (session) {
-		session->cancel_all_solo ();
-	}
+	cancel_all_solo ();
 	return none;
 }