diff --git a/libs/ardour/audio_unit.cc b/libs/ardour/audio_unit.cc
index 2119e4c375..e02a00c28e 100644
--- a/libs/ardour/audio_unit.cc
+++ b/libs/ardour/audio_unit.cc
@@ -2790,11 +2790,6 @@ AUPlugin::parameter_change_listener (void* /*arg*/, void* /*src*/, const AudioUn
 	ParameterMap::iterator i = parameter_map.find (event->mArgument.mParameter.mParameterID);
 
 	if (i != parameter_map.end()) {
-		boost::shared_ptr<AutomationControl> ac = automation_control (Evoral::Parameter (PluginAutomation, 0, i->second));
-		if (ac) {
-			cerr << "updating " << ac->name() << " to << new_value << endl;
-			ac->set_double (new_value);
-		}
 		ParameterChanged (i->second, new_value);
 	}
 }
diff --git a/libs/ardour/plugin_insert.cc b/libs/ardour/plugin_insert.cc
index a33dee2dbf..1ef32d6127 100644
--- a/libs/ardour/plugin_insert.cc
+++ b/libs/ardour/plugin_insert.cc
@@ -264,8 +264,18 @@ PluginInsert::create_automatable_parameters ()
 void
 PluginInsert::parameter_changed (Evoral::Parameter which, float val)
 {
-	if (which.type() != PluginAutomation)
+	if (which.type() != PluginAutomation) {
 		return;
+	}
+
+	cerr << "Param change: " << which << endl;
+
+	boost::shared_ptr<AutomationControl> ac = automation_control (which);
+		
+	if (ac) {
+		cerr << "updating " << ac->name() << " to " << val << endl;
+		ac->set_double (val);
+	}
 
 	Plugins::iterator i = _plugins.begin();
 
@@ -1258,6 +1268,11 @@ void
 PluginInsert::add_plugin (boost::shared_ptr<Plugin> plugin)
 {
 	plugin->set_insert_info (this);
+	
+	if (_plugins.empty()) {
+		plugin->ParameterChanged.connect_same_thread (*this, boost::bind (&PluginInsert::parameter_changed, this, _1, _2));
+	}
+
 	_plugins.push_back (plugin);
 }