diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index 1d1b75239b..749552b0d2 100644
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -223,7 +223,6 @@ Route::set_remote_control_id_internal (uint32_t id, bool notify_class_listeners)
 	}
 
 	if (id < 1) {
-		error << _("Remote Control ID's start at one, not zero") << endmsg;
 		return;
 	}
 
@@ -2223,6 +2222,10 @@ Route::set_state_2X (const XMLNode& node, int version)
 		_flags = Flag (0);
 	}
 
+	if (is_master() || is_monitor() || is_hidden()) {
+		_mute_master->set_solo_ignore (true);
+	}
+
 	if ((prop = node.property (X_("phase-invert"))) != 0) {
 		boost::dynamic_bitset<> p (_input->n_ports().n_audio ());
 		if (string_is_affirmative (prop->value ())) {