diff --git a/gdbus/watch.c b/gdbus/watch.c
index e7c203ae..9cb7ec70 100644
--- a/gdbus/watch.c
+++ b/gdbus/watch.c
@@ -477,6 +477,11 @@ static DBusHandlerResult service_filter(DBusConnection *connection,
 				cb->conn_func(connection, cb->user_data);
 		}
 
+		/* Check if the watch was removed/freed by the callback
+		 * function */
+		if (!g_slist_find(data->callbacks, cb))
+			continue;
+
 		/* Only auto remove if it is a bus name watch */
 		if (data->argument[0] == ':' &&
 				(cb->conn_func == NULL || cb->disc_func == NULL)) {
@@ -484,11 +489,6 @@ static DBusHandlerResult service_filter(DBusConnection *connection,
 			continue;
 		}
 
-		/* Check if the watch was removed/freed by the callback
-		 * function */
-		if (!g_slist_find(data->callbacks, cb))
-			continue;
-
 		data->callbacks = g_slist_remove(data->callbacks, cb);
 		data->processed = g_slist_append(data->processed, cb);
 	}