diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TableRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TableRepository.java
index 50acf9bb72a..85501e30d4d 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TableRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TableRepository.java
@@ -386,7 +386,9 @@ public class TableRepository extends EntityRepository<Table> {
     if (oldQuery != null && query.getUsers() != null) {
       // Merge old and new users
       List<EntityReference> userList = query.getUsers();
-      userList.addAll(oldQuery.getUsers());
+      if (oldQuery.getUsers() != null) {
+        userList.addAll(oldQuery.getUsers());
+      }
       HashSet<EntityReference> userSet = new HashSet<>(userList);
       query.setUsers(new ArrayList<>(userSet));
     }