diff --git a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionManagerImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionManagerImpl.java
index 617f56e421364..80a1a436c7d04 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionManagerImpl.java
@@ -123,9 +123,10 @@ public void unregisterIntention(@NotNull IntentionAction intentionAction) {
   public void dispose() {
   }
 
-  private static @NotNull IntentionAction createFixAllIntentionInternal(@NotNull InspectionToolWrapper<?, ?> toolWrapper,
+  private static @Nullable IntentionAction createFixAllIntentionInternal(@NotNull InspectionToolWrapper<?, ?> toolWrapper,
                                                                         @NotNull IntentionAction action) {
     LocalQuickFix fix = QuickFixWrapper.unwrap(action);
+    if (fix != null && !fix.availableInBatchMode()) return null;
     PsiFile file = QuickFixWrapper.unwrapFile(action);
     return new CleanupInspectionIntention(toolWrapper, fix == null ? action : fix, file, action.getText());
   }