diff --git a/platform/indexing-impl/src/com/intellij/util/indexing/SingleEntryCompositeIndexer.java b/platform/indexing-impl/src/com/intellij/util/indexing/SingleEntryCompositeIndexer.java
index b1a76ced36c2..0ba382c8eeb1 100644
--- a/platform/indexing-impl/src/com/intellij/util/indexing/SingleEntryCompositeIndexer.java
+++ b/platform/indexing-impl/src/com/intellij/util/indexing/SingleEntryCompositeIndexer.java
@@ -20,7 +20,8 @@ public abstract class SingleEntryCompositeIndexer<V, SubIndexerType, SubIndexerV
   @Nullable
   @Override
   protected V computeValue(@NotNull FileContent inputData) {
-    return computeValue(inputData, calculateSubIndexer(inputData));
+    SubIndexerType subIndexerType = calculateSubIndexer(inputData);
+    return subIndexerType != null ? computeValue(inputData, subIndexerType) : null;
   }
 
   @Nullable