diff --git a/gtk2_ardour/automation_region_view.cc b/gtk2_ardour/automation_region_view.cc
index 41490d9619..b73d3796b5 100644
--- a/gtk2_ardour/automation_region_view.cc
+++ b/gtk2_ardour/automation_region_view.cc
@@ -198,17 +198,15 @@ AutomationRegionView::add_automation_event (GdkEvent *, timepos_t const & w, dou
 
 	_line->view_to_model_coord_y (y);
 
-	if (UIConfiguration::instance().get_new_automation_points_on_lane()) {
-		if (c->list()->size () == 0) {
-			/* we need the MidiTrack::MidiControl, not the region's (midi model source) control */
-			boost::shared_ptr<ARDOUR::MidiTrack> mt = boost::dynamic_pointer_cast<ARDOUR::MidiTrack> (view->parent_stripable ());
-			assert (mt);
-			boost::shared_ptr<Evoral::Control> mc = mt->control(_parameter);
-			assert (mc);
-			y = mc->user_double ();
-		} else {
-			y = c->list()->eval (when);
-		}
+	if (c->list()->size () == 0) {
+		/* we need the MidiTrack::MidiControl, not the region's (midi model source) control */
+		boost::shared_ptr<ARDOUR::MidiTrack> mt = boost::dynamic_pointer_cast<ARDOUR::MidiTrack> (view->parent_stripable ());
+		assert (mt);
+		boost::shared_ptr<Evoral::Control> mc = mt->control(_parameter);
+		assert (mc);
+		y = mc->user_double ();
+	} else if (UIConfiguration::instance().get_new_automation_points_on_lane()) {
+		y = c->list()->eval (when);
 	}
 
 	XMLNode& before = _line->the_list()->get_state();
diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc
index 797a0cc259..bb21fd8b40 100644
--- a/gtk2_ardour/automation_time_axis.cc
+++ b/gtk2_ardour/automation_time_axis.cc
@@ -770,7 +770,7 @@ AutomationTimeAxisView::add_automation_event (GdkEvent* event, timepos_t const &
 	timepos_t when (pos);
 	_editor.snap_to_with_modifier (when, event);
 
-	if (UIConfiguration::instance().get_new_automation_points_on_lane()) {
+	if (UIConfiguration::instance().get_new_automation_points_on_lane() || _control->list()->size ()) {
 		if (_control->list()->size () == 0) {
 			y = _control->get_value ();
 		} else {