diff --git a/gtk2_ardour/cue_editor.cc b/gtk2_ardour/cue_editor.cc
index 2c1185fdf6..c0bdae24eb 100644
--- a/gtk2_ardour/cue_editor.cc
+++ b/gtk2_ardour/cue_editor.cc
@@ -1471,11 +1471,14 @@ CueEditor::unset (bool trigger_too)
 	count_in_connection.disconnect ();
 	capture_connections.drop_connections ();
 
-	_track.reset ();
 	_region.reset ();
 
 	if (trigger_too) {
 		ref = TriggerReference ();
+		_track.reset ();
+	} else if (_track) {
+		/* re-subscribe to object_connections */
+		set_track (_track);
 	}
 }