diff --git a/panels/network/cc-wifi-panel.c b/panels/network/cc-wifi-panel.c
index 95e01f28b..1c958621d 100644
--- a/panels/network/cc-wifi-panel.c
+++ b/panels/network/cc-wifi-panel.c
@@ -512,6 +512,10 @@ device_removed_cb (CcWifiPanel *self, NMDevice *device)
 
   remove_wifi_device (self, device);
   check_main_stack_page (self);
+
+  g_signal_handlers_disconnect_by_func (device,
+                                        G_CALLBACK (device_state_changed_cb),
+                                        self);
 }
 
 static void