diff --git a/shield/src/main/java/org/elasticsearch/shield/ShieldPlugin.java b/shield/src/main/java/org/elasticsearch/shield/ShieldPlugin.java
index 2f5ac7334a2..fc7a9a2e0a4 100644
--- a/shield/src/main/java/org/elasticsearch/shield/ShieldPlugin.java
+++ b/shield/src/main/java/org/elasticsearch/shield/ShieldPlugin.java
@@ -192,12 +192,7 @@ public class ShieldPlugin extends Plugin {
         }
         if (clientMode == false) {
             module.registerQueryCache(ShieldPlugin.OPT_OUT_QUERY_CACHE, OptOutQueryCache::new);
-            module.addIndexEventListener(new IndexEventListener() {
-                @Override
-                public void afterIndexCreated(IndexService indexService) {
-                    failIfShieldQueryCacheIsNotActive(indexService.getIndexSettings().getSettings(), false);
-                }
-            });
+            failIfShieldQueryCacheIsNotActive(module.getSettings(), false);
         }
     }