diff --git a/lib/wp/device.c b/lib/wp/device.c
index c0f544ad..92368106 100644
--- a/lib/wp/device.c
+++ b/lib/wp/device.c
@@ -270,6 +270,7 @@ wp_spa_device_finalize (GObject * object)
 {
   WpSpaDevice *self = WP_SPA_DEVICE (object);
 
+  g_clear_pointer (&self->proxy, pw_proxy_destroy);
   self->device = NULL;
   g_clear_pointer (&self->handle, pw_unload_spa_handle);
   g_clear_pointer (&self->properties, wp_properties_unref);
diff --git a/modules/module-monitor.c b/modules/module-monitor.c
index ca67706f..db5be6b2 100644
--- a/modules/module-monitor.c
+++ b/modules/module-monitor.c
@@ -393,7 +393,6 @@ wp_monitor_deactivate (WpPlugin * plugin)
 {
   WpMonitor *self = WP_MONITOR (plugin);
 
-  wp_core_disconnect (self->local_core);
   g_clear_object (&self->monitor);
 }