diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/SwitchBlockHighlightingModel.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/SwitchBlockHighlightingModel.java
index c0063be15123..ef99f3478e73 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/SwitchBlockHighlightingModel.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/SwitchBlockHighlightingModel.java
@@ -21,12 +21,6 @@ import static com.intellij.java.codeserver.core.JavaPatternExhaustivenessUtil.ha
 import static java.util.Objects.requireNonNullElse;
 
 public final class SwitchBlockHighlightingModel {
-  public static boolean shouldAddDefault(@NotNull PsiSwitchBlock block) {
-    if (!ExpressionUtil.isEnhancedSwitch(block)) return false;
-    if (JavaPsiSwitchUtil.getUnconditionalPatternLabel(block) != null) return false;
-    if (JavaPsiSwitchUtil.findDefaultElement(block) != null) return false;
-    return hasExhaustivenessError(block);
-  }
 
   static void checkExhaustiveness(@NotNull PsiSwitchBlock block, @NotNull Consumer<? super HighlightInfo.Builder> errorSink) {
     PsiCodeBlock body = block.getBody();
diff --git a/java/java-impl/src/com/intellij/codeInspection/dataFlow/fix/DeleteSwitchLabelFix.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/fix/DeleteSwitchLabelFix.java
index 32ebf86859cb..7fb22159dc9b 100644
--- a/java/java-impl/src/com/intellij/codeInspection/dataFlow/fix/DeleteSwitchLabelFix.java
+++ b/java/java-impl/src/com/intellij/codeInspection/dataFlow/fix/DeleteSwitchLabelFix.java
@@ -1,7 +1,7 @@
 // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.codeInspection.dataFlow.fix;
 
-import com.intellij.codeInsight.daemon.impl.analysis.SwitchBlockHighlightingModel;
+import com.intellij.codeInsight.ExpressionUtil;
 import com.intellij.java.analysis.JavaAnalysisBundle;
 import com.intellij.java.codeserver.core.JavaPsiSwitchUtil;
 import com.intellij.modcommand.ActionContext;
@@ -27,6 +27,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
+import static com.intellij.java.codeserver.core.JavaPatternExhaustivenessUtil.hasExhaustivenessError;
+
 public class DeleteSwitchLabelFix extends PsiUpdateModCommandAction<PsiCaseLabelElement> {
   private final String myName;
   private final boolean myAddDefaultIfNecessary;
@@ -74,7 +76,7 @@ public class DeleteSwitchLabelFix extends PsiUpdateModCommandAction<PsiCaseLabel
     PsiSwitchBlock block = label.getEnclosingSwitchBlock();
     if (block == null) return;
     deleteLabelElement(context.project(), labelElement);
-    if (myAddDefaultIfNecessary && SwitchBlockHighlightingModel.shouldAddDefault(block)) {
+    if (myAddDefaultIfNecessary && shouldAddDefault(block)) {
       CreateDefaultBranchFix.addDefault(block, updater);
     }
   }
@@ -155,4 +157,11 @@ public class DeleteSwitchLabelFix extends PsiUpdateModCommandAction<PsiCaseLabel
     }
     new CommentTracker().deleteAndRestoreComments(label);
   }
+
+  public static boolean shouldAddDefault(@NotNull PsiSwitchBlock block) {
+    if (!ExpressionUtil.isEnhancedSwitch(block)) return false;
+    if (JavaPsiSwitchUtil.getUnconditionalPatternLabel(block) != null) return false;
+    if (JavaPsiSwitchUtil.findDefaultElement(block) != null) return false;
+    return hasExhaustivenessError(block);
+  }
 }