diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
index 8039e552e9..8173217c22 100644
--- a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
+++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
@@ -496,7 +496,7 @@ GenericMidiControlProtocol::get_state ()
 		   file.
 		*/
 
-		if ((*i)->learned()) {
+		if ((*i)->get_controllable() && (*i)->learned()) {
 			children->add_child_nocopy ((*i)->get_state());
 		}
 	}