diff --git a/dbus/dbus-gmain.c b/dbus/dbus-gmain.c
index 7496c65..40b4c45 100644
--- a/dbus/dbus-gmain.c
+++ b/dbus/dbus-gmain.c
@@ -285,7 +285,7 @@ connection_setup_remove_watch (ConnectionSetup *cs,
 
   handler = dbus_watch_get_data (watch);
 
-  if (handler == NULL)
+  if (handler == NULL || handler->cs != cs)
     return;
   
   io_handler_destroy_source (handler);