diff --git a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/preprocessor/ConnectionPreProcessor.java b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/preprocessor/ConnectionPreProcessor.java
index 3ece36f37d..d531b73a64 100644
--- a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/preprocessor/ConnectionPreProcessor.java
+++ b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/preprocessor/ConnectionPreProcessor.java
@@ -194,21 +194,18 @@ private void processUpdateConnection(EntityMutationContext context, AtlasStruct
 
             // Update Keycloak roles
             RoleRepresentation representation = getKeycloakClient().getRoleByName(roleName);
-            if (newAdminUsers != null) {
-                List<String> finalStateUsers = determineFinalState(newAdminUsers, currentAdminUsers);
-                keycloakStore.updateRoleUsers(roleName, currentAdminUsers, finalStateUsers, representation);
+            List<String> finalStateUsers = determineFinalState(newAdminUsers, currentAdminUsers);
+            keycloakStore.updateRoleUsers(roleName, currentAdminUsers, finalStateUsers, representation);
 
-            }
-            if (newAdminGroups != null) {
-                List<String> finalStateGroups = determineFinalState(newAdminGroups, currentAdminGroups);
-                keycloakStore.updateRoleGroups(roleName, currentAdminGroups, finalStateGroups, representation);
 
-            }
-            if (newAdminRoles != null) {
-                List<String> finalStateRoles = determineFinalState(newAdminRoles, currentAdminRoles);
-                keycloakStore.updateRoleRoles(roleName, currentAdminRoles, finalStateRoles, representation);
+            List<String> finalStateGroups = determineFinalState(newAdminGroups, currentAdminGroups);
+            keycloakStore.updateRoleGroups(roleName, currentAdminGroups, finalStateGroups, representation);
+
+
+            List<String> finalStateRoles = determineFinalState(newAdminRoles, currentAdminRoles);
+            keycloakStore.updateRoleRoles(roleName, currentAdminRoles, finalStateRoles, representation);
+
 
-            }
             RequestContext.get().endMetricRecord(metricRecorder);
         }
     }