diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java
index d304ff1ad171..f8b496d73cb8 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java
@@ -189,13 +189,15 @@ public class JavaBuilder extends ModuleLevelBuilder {
         }
       });
 
-      if (JavaBuilderUtil.isCompileJavaIncrementally(context)) {
+      if (!filesToCompile.isEmpty() || dirtyFilesHolder.hasRemovedFiles()) {
         // at the moment, there is no incremental compilation for module-info files, so they should be rebuilt on every change
         JavaModuleIndex index = getJavaModuleIndex(context);
         for (JpsModule module : chunk.getModules()) {
           ContainerUtil.addIfNotNull(filesToCompile, index.getModuleInfoFile(module));
         }
+      }
 
+      if (JavaBuilderUtil.isCompileJavaIncrementally(context)) {
         ProjectBuilderLogger logger = context.getLoggingManager().getProjectBuilderLogger();
         if (logger.isEnabled() && !filesToCompile.isEmpty()) {
           logger.logCompiledFiles(filesToCompile, BUILDER_NAME, "Compiling files:");