diff --git a/libs/ardour/ardour/triggerbox.h b/libs/ardour/ardour/triggerbox.h
index ba40889566..d67b1a1e73 100644
--- a/libs/ardour/ardour/triggerbox.h
+++ b/libs/ardour/ardour/triggerbox.h
@@ -237,7 +237,6 @@ class LIBARDOUR_API Trigger : public PBD::Stateful {
 
 	void set_pending (Trigger*);
 	Trigger* swap_pending (Trigger*);
-	void swap_notify ();
 
 	virtual SegmentDescriptor get_segment_descriptor () const = 0;
 
diff --git a/libs/ardour/triggerbox.cc b/libs/ardour/triggerbox.cc
index 6f19ba3576..99dd30907e 100644
--- a/libs/ardour/triggerbox.cc
+++ b/libs/ardour/triggerbox.cc
@@ -118,12 +118,6 @@ Trigger::set_pending (Trigger* t)
 	}
 }
 
-void
-Trigger::swap_notify ()
-{
-	PropertyChanged (Properties::name);
-}
-
 Trigger*
 Trigger::swap_pending (Trigger* t)
 {
@@ -300,6 +294,7 @@ Trigger::set_region (boost::shared_ptr<Region> r)
 	if (!r) {
 		/* clear operation, no need to talk to the worker thread */
 		set_pending ((Trigger*) 0);
+		request_stop ();
 	} else {
 		/* load data, do analysis in another thread */
 		TriggerBox::worker->set_region (_box, index(), r);