diff --git a/gtk2_ardour/pianoroll.cc b/gtk2_ardour/pianoroll.cc
index 51e3373d74..3c6c75841f 100644
--- a/gtk2_ardour/pianoroll.cc
+++ b/gtk2_ardour/pianoroll.cc
@@ -1865,6 +1865,13 @@ Pianoroll::set_session (ARDOUR::Session* s)
 	}
 }
 
+void
+Pianoroll::session_going_away ()
+{
+	CueEditor::session_going_away ();
+	_update_connection.disconnect ();
+}
+
 void
 Pianoroll::map_transport_state ()
 {
diff --git a/gtk2_ardour/pianoroll.h b/gtk2_ardour/pianoroll.h
index 4ddc4d4e4a..8cfbfb5e38 100644
--- a/gtk2_ardour/pianoroll.h
+++ b/gtk2_ardour/pianoroll.h
@@ -148,6 +148,7 @@ class Pianoroll : public CueEditor
 	bool key_release_handler (ArdourCanvas::Item*, GdkEvent*, ItemType);
 
 	void escape ();
+	void session_going_away ();
 
  private:
 	ArdourCanvas::Ruler*     bbt_ruler;