diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index 0fd739834..97452275f 100644
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -497,9 +497,12 @@ class NotificationBanner extends Calendar.NotificationMessage {
         });
     }
 
-    _onDestroy() {
-        super._onDestroy();
-        this.notification.disconnect(this._activatedId);
+    _disconnectNotificationSignals() {
+        super._disconnectNotificationSignals();
+
+        if (this._activatedId)
+            this.notification.disconnect(this._activatedId);
+        this._activatedId = 0;
     }
 
     _onUpdated(n, clear) {