diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index 571231d7a..d9755a3bf 100644
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -861,6 +861,7 @@ const WirelessNetwork = GObject.registerClass({
         if (!this._accessPoints.delete(ap))
             return false;
 
+        ap.disconnectObject(this);
         this._updateBestAp();
 
         if (wasActive !== this.is_active)
@@ -1069,6 +1070,11 @@ const NMWirelessDeviceItem = GObject.registerClass({
         this._activeConnectionChanged();
         this._availableConnectionsChanged();
         this._updateItemsVisibility();
+
+        this.connect('destroy', () => {
+            for (const net of this._networkItems.keys())
+                net.destroy();
+        });
     }
 
     get icon_name() {