diff --git a/libs/surfaces/mackie/gui.cc b/libs/surfaces/mackie/gui.cc
index 2b69c2da01..b431795880 100644
--- a/libs/surfaces/mackie/gui.cc
+++ b/libs/surfaces/mackie/gui.cc
@@ -653,11 +653,9 @@ MackieControlProtocolGUI::action_changed (const Glib::ustring &sPath, const Tree
 {
 	string action_path = (*iter)[action_model.columns().path];
 
-	// Remove Binding is not in the action map but still valid
-
 	bool remove = false;
 
-	if (action_path == "Remove Binding") {
+	if (action_path.empty()) {
 		remove = true;
 	}
 
diff --git a/libs/surfaces/us2400/gui.cc b/libs/surfaces/us2400/gui.cc
index 5236ead357..00423c7627 100644
--- a/libs/surfaces/us2400/gui.cc
+++ b/libs/surfaces/us2400/gui.cc
@@ -442,11 +442,9 @@ US2400ProtocolGUI::action_changed (const Glib::ustring &sPath, const TreeModel::
 {
 	string action_path = (*iter)[action_model.columns().path];
 
-	// Remove Binding is not in the action map but still valid
-
 	bool remove = false;
 
-	if (action_path == "Remove Binding") {
+	if (action_path.empty()) {
 		remove = true;
 	}