diff --git a/src/main/java/org/opensearch/security/configuration/DlsFlsValveImpl.java b/src/main/java/org/opensearch/security/configuration/DlsFlsValveImpl.java
index 498b908e5d..ede36819ed 100644
--- a/src/main/java/org/opensearch/security/configuration/DlsFlsValveImpl.java
+++ b/src/main/java/org/opensearch/security/configuration/DlsFlsValveImpl.java
@@ -38,6 +38,7 @@
 import org.opensearch.action.bulk.BulkItemRequest;
 import org.opensearch.action.bulk.BulkShardRequest;
 import org.opensearch.action.search.SearchRequest;
+import org.opensearch.action.update.UpdateAction;
 import org.opensearch.action.update.UpdateRequest;
 import org.opensearch.client.Client;
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
@@ -264,7 +265,7 @@ public boolean invoke(PrivilegesEvaluationContext context, final ActionListener<
                 }
             }
 
-            if (request instanceof UpdateRequest) {
+            if (UpdateAction.NAME.equals(context.getAction())) {
                 listener.onFailure(new OpenSearchSecurityException("Update is not supported when FLS or DLS or Fieldmasking is activated"));
                 return false;
             }
@@ -679,7 +680,7 @@ static Mode get(Settings settings) {
     public void updateConfiguration(SecurityDynamicConfiguration<RoleV7> rolesConfiguration) {
         try {
             if (rolesConfiguration != null) {
-                DlsFlsProcessedConfig oldConfig = this.dlsFlsProcessedConfig.getAndSet(
+                this.dlsFlsProcessedConfig.set(
                     new DlsFlsProcessedConfig(
                         DynamicConfigFactory.addStatics(rolesConfiguration.clone()),
                         clusterService.state().metadata().getIndicesLookup(),
@@ -688,10 +689,6 @@ public void updateConfiguration(SecurityDynamicConfiguration<RoleV7> rolesConfig
                         fieldMaskingConfig
                     )
                 );
-
-                if (oldConfig != null) {
-                    oldConfig.shutdown();
-                }
             }
         } catch (Exception e) {
             log.error("Error while updating DLS/FLS configuration with {}", rolesConfiguration, e);
diff --git a/src/main/java/org/opensearch/security/privileges/dlsfls/DlsFlsProcessedConfig.java b/src/main/java/org/opensearch/security/privileges/dlsfls/DlsFlsProcessedConfig.java
index b217b59df3..d7ade17e19 100644
--- a/src/main/java/org/opensearch/security/privileges/dlsfls/DlsFlsProcessedConfig.java
+++ b/src/main/java/org/opensearch/security/privileges/dlsfls/DlsFlsProcessedConfig.java
@@ -71,6 +71,7 @@ protected void updateClusterStateMetadata(Metadata metadata) {
         long duration = System.currentTimeMillis() - start;
 
         log.debug("Updating DlsFlsProcessedConfig took {} ms", duration);
+        this.metadataVersionEffective = metadata.version();
     }
 
     @Override