diff --git a/operator/src/main/java/it/aboutbits/postgresql/crd/grant/GrantService.java b/operator/src/main/java/it/aboutbits/postgresql/crd/grant/GrantService.java
index cb64964..b80b749 100644
--- a/operator/src/main/java/it/aboutbits/postgresql/crd/grant/GrantService.java
+++ b/operator/src/main/java/it/aboutbits/postgresql/crd/grant/GrantService.java
@@ -312,7 +312,7 @@ public Map<String, Set<Privilege>> determineCurrentObjectPrivileges(
                                         OID_DATA_TYPE,
                                         val(schema)
                                 )),
-                                objects.isEmpty() ? noCondition() : PG_CLASS.RELNAME.in(objects),
+                                isAllMode ? noCondition() : PG_CLASS.RELNAME.in(objects),
                                 // See https://www.postgresql.org/docs/current/catalog-pg-class.html#CATALOG-PG-CLASS
                                 PG_CLASS.RELKIND.in(
                                         "r", // Ordinary Table
@@ -324,7 +324,7 @@ public Map<String, Set<Privilege>> determineCurrentObjectPrivileges(
                         )
                         .fetchMap(PG_CLASS.RELNAME, isOwnerCondition);
 
-                if (objects.isEmpty()) {
+                if (isAllMode) {
                     objectExistenceAndOwnershipMap.putAll(existingObjectsOwner);
                 } else {
                     for (var object : objects) {