diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc
index 8f57fefe87..a92ac38530 100644
--- a/gtk2_ardour/automation_time_axis.cc
+++ b/gtk2_ardour/automation_time_axis.cc
@@ -88,7 +88,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (
 		have_name_font = true;
 	}
 
-	if (_control) {
+	if (_automatable && _control) {
 		_controller = AutomationController::create (_automatable, _control->parameter(), _control);
 	}
 
diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc
index 77e862d8a9..2df561da3d 100644
--- a/gtk2_ardour/midi_time_axis.cc
+++ b/gtk2_ardour/midi_time_axis.cc
@@ -846,7 +846,7 @@ MidiTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool
 			new AutomationTimeAxisView (
 				_session,
 				_route, 
-				_route,
+				boost::shared_ptr<Automatable> (),
 				boost::shared_ptr<AutomationControl> (),
 				param,
 				_editor,