diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc
index 84529d167f..f56006e5ce 100644
--- a/gtk2_ardour/location_ui.cc
+++ b/gtk2_ardour/location_ui.cc
@@ -839,7 +839,9 @@ LocationUI::LocationUI ()
 
 LocationUI::~LocationUI()
 {
-        delete _clock_group;
+	loop_edit_row.unset_clock_group ();
+	punch_edit_row.unset_clock_group ();
+	delete _clock_group;
 }
 
 gint
diff --git a/gtk2_ardour/location_ui.h b/gtk2_ardour/location_ui.h
index 76dca563fc..b24865b6cc 100644
--- a/gtk2_ardour/location_ui.h
+++ b/gtk2_ardour/location_ui.h
@@ -58,6 +58,7 @@ class LocationEditRow  : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 	void set_number (int);
 	void focus_name();
         void set_clock_group (ClockGroup&);
+        void unset_clock_group () { _clock_group = 0; }
 
 	sigc::signal<void,ARDOUR::Location*> remove_requested;
 	sigc::signal<void> redraw_ranges;