diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc
index f65d2282b3..74f4470839 100644
--- a/gtk2_ardour/automation_time_axis.cc
+++ b/gtk2_ardour/automation_time_axis.cc
@@ -313,13 +313,16 @@ AutomationTimeAxisView::AutomationTimeAxisView (
 
 AutomationTimeAxisView::~AutomationTimeAxisView ()
 {
-	cleanup_gui_properties ();
+	if (_stripable) {
+		cleanup_gui_properties ();
+	}
 	delete _view;
 }
 
 void
 AutomationTimeAxisView::route_going_away ()
 {
+	cleanup_gui_properties ();
 	_stripable.reset ();
 }