diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyRepository.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyRepository.java
index c3e7cc23a7..e842aa5dcf 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyRepository.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyRepository.java
@@ -1021,17 +1021,19 @@ private List<RangerContextEnricher> buildContextEnrichers(RangerPolicyEngineOpti
                     }
                 }
 
-                if (!options.disableContextEnrichers) {
-                    RangerServiceDef.RangerContextEnricherDef contextEnricherDef = enricherDef;
-
-                    // Following will be true only if the engine is initialized within ranger-admin
-                    if (options.enableTagEnricherWithLocalRefresher && StringUtils.equals(enricherDef.getEnricher(), RangerTagEnricher.class.getName())) {
-                        contextEnricherDef = new RangerServiceDef.RangerContextEnricherDef(enricherDef.getItemId(), enricherDef.getName(), "org.apache.ranger.common.RangerAdminTagEnricher", null);
-                    } else if (options.enableUserStoreEnricherWithLocalRefresher && StringUtils.equals(enricherDef.getEnricher(), RangerUserStoreEnricher.class.getName())) {
-                        contextEnricherDef = new RangerServiceDef.RangerContextEnricherDef(enricherDef.getItemId(), enricherDef.getName(), "org.apache.ranger.common.RangerAdminUserStoreEnricher", null);
+                // Following 2 cases will be true only if the engine is initialized within ranger-admin
+                if (options.enableTagEnricherWithLocalRefresher && StringUtils.equals(enricherDef.getEnricher(), RangerTagEnricher.class.getName())) {
+                    enricherDef = new RangerServiceDef.RangerContextEnricherDef(enricherDef.getItemId(), enricherDef.getName(), "org.apache.ranger.common.RangerAdminTagEnricher", null);
+                } else if (options.enableUserStoreEnricherWithLocalRefresher && StringUtils.equals(enricherDef.getEnricher(), RangerUserStoreEnricher.class.getName())) {
+                    enricherDef = new RangerServiceDef.RangerContextEnricherDef(enricherDef.getItemId(), enricherDef.getName(), "org.apache.ranger.common.RangerAdminUserStoreEnricher", null);
+                } else {
+                    if (options.disableContextEnrichers) {
+                        enricherDef = null;
                     }
+                }
 
-                    RangerContextEnricher contextEnricher = buildContextEnricher(contextEnricherDef, options);
+                if (enricherDef != null) {
+                    RangerContextEnricher contextEnricher = buildContextEnricher(enricherDef, options);
 
                     if (contextEnricher != null) {
                         contextEnrichers.add(contextEnricher);