diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc
index 4e0492999a..a8dfb14181 100644
--- a/gtk2_ardour/generic_pluginui.cc
+++ b/gtk2_ardour/generic_pluginui.cc
@@ -987,9 +987,7 @@ void
 GenericPluginUI::set_all_automation (AutoState as)
 {
 	for (vector<ControlUI*>::iterator i = input_controls_with_automation.begin(); i != input_controls_with_automation.end(); ++i) {
-		if ((*i)->controller || (*i)->button) {
-			set_automation_state (as, (*i));
-		}
+		set_automation_state (as, (*i));
 	}
 }