diff --git a/server/src/main/java/org/elasticsearch/indices/IndicesService.java b/server/src/main/java/org/elasticsearch/indices/IndicesService.java index 32cbc4f70212b..6bacc17b2886d 100644 --- a/server/src/main/java/org/elasticsearch/indices/IndicesService.java +++ b/server/src/main/java/org/elasticsearch/indices/IndicesService.java @@ -874,6 +874,9 @@ public IndexMetaData verifyIndexIsDeleted(final Index index, final ClusterState final IndexMetaData metaData; try { metaData = metaStateService.loadIndexState(index); + if (metaData == null) { + return null; + } } catch (Exception e) { logger.warn(() -> new ParameterizedMessage("[{}] failed to load state file from a stale deleted index, " + "folders will be left on disk", index), e);