diff --git a/gtk2_ardour/foldback_strip.cc b/gtk2_ardour/foldback_strip.cc
index 55c594f639..c6999c7920 100644
--- a/gtk2_ardour/foldback_strip.cc
+++ b/gtk2_ardour/foldback_strip.cc
@@ -555,14 +555,13 @@ FoldbackStrip::name () const
 void
 FoldbackStrip::set_route (boost::shared_ptr<Route> rt)
 {
-	RouteUI::set_route (rt);
-
 	if (!rt) {
 		clear_send_box ();
-		RouteUI::self_delete ();
 		return;
 	}
 
+	RouteUI::set_route (rt);
+
 	_output_button.set_route (_route, this);
 
 	int number = 0;
@@ -1117,5 +1116,4 @@ FoldbackStrip::remove_current_fb ()
 
 	set_route (next);
 	_session->remove_route (old_route);
-	update_sensitivity ();
 }
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index 517ab2e9f1..7a319af01d 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -319,10 +319,6 @@ RouteUI::set_route (boost::shared_ptr<Route> rp)
 
 	_route = rp;
 
-	if (!_route) {
-		return;
-	}
-
 	if (!_route->presentation_info().color_set()) {
 		/* deal with older 4.x color, which was stored in the GUI object state */