diff --git a/src/shell-camera-monitor.c b/src/shell-camera-monitor.c
index 1e2e0f145..b2e6e0b2a 100644
--- a/src/shell-camera-monitor.c
+++ b/src/shell-camera-monitor.c
@@ -298,7 +298,11 @@ shell_camera_monitor_disconnect_core (ShellCameraMonitor *monitor)
   g_clear_handle_id (&monitor->delayed_disable_id, g_source_remove);
 
   spa_hook_remove (&monitor->registry_listener);
-  g_clear_pointer ((struct pw_proxy**) &monitor->registry, pw_proxy_destroy);
+  if (monitor->registry != NULL)
+    {
+      pw_proxy_destroy ((struct pw_proxy *) monitor->registry);
+      monitor->registry = NULL;
+    }
   spa_hook_remove (&monitor->core_listener);
   g_clear_pointer (&monitor->core, pw_core_disconnect);
 }