diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaGenerateMemberCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaGenerateMemberCompletionContributor.java
index ec805709c1d7..810f27c1cf84 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaGenerateMemberCompletionContributor.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaGenerateMemberCompletionContributor.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.
+// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.codeInsight.completion;
 
-import com.intellij.codeInsight.completion.command.configuration.ApplicationCommandCompletionService;
+import com.intellij.codeInsight.completion.command.configuration.CommandCompletionSettingsService;
 import com.intellij.codeInsight.completion.impl.CamelHumpMatcher;
 import com.intellij.codeInsight.generation.*;
 import com.intellij.codeInsight.lookup.LookupElement;
@@ -177,7 +177,7 @@ public final class JavaGenerateMemberCompletionContributor {
       if (!baseMethod.isConstructor() && baseClass != null && addedSignatures.add(baseMethod.getSignature(substitutor))) {
         result.addElement(
           createOverridingLookupElement(implemented, baseMethod, baseClass, substitutor, generateDefaultMethods, parent, null));
-        if (GenerateEqualsHandler.hasNonStaticFields(parent) && !ApplicationCommandCompletionService.getInstance().commandCompletionEnabled()) {
+        if (GenerateEqualsHandler.hasNonStaticFields(parent) && !CommandCompletionSettingsService.getInstance().commandCompletionEnabled()) {
           if (MethodUtils.isEquals(baseMethod) || MethodUtils.isHashCode(baseMethod)) {
             result.addElement(
               createOverridingLookupElement(implemented, baseMethod, baseClass, substitutor, generateDefaultMethods, parent, context -> {
diff --git a/java/java-impl/src/com/intellij/codeInsight/editorActions/JavaTypedHandler.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/JavaTypedHandler.java
index 8742af5c0219..2d573943bc6f 100644
--- a/java/java-impl/src/com/intellij/codeInsight/editorActions/JavaTypedHandler.java
+++ b/java/java-impl/src/com/intellij/codeInsight/editorActions/JavaTypedHandler.java
@@ -5,7 +5,7 @@ import com.intellij.application.options.CodeStyle;
 import com.intellij.codeInsight.AutoPopupController;
 import com.intellij.codeInsight.completion.CompletionType;
 import com.intellij.codeInsight.completion.JavaClassReferenceCompletionContributor;
-import com.intellij.codeInsight.completion.command.configuration.ApplicationCommandCompletionService;
+import com.intellij.codeInsight.completion.command.configuration.CommandCompletionSettingsService;
 import com.intellij.java.syntax.parser.JavaKeywords;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.Editor;
@@ -209,7 +209,7 @@ public final class JavaTypedHandler extends JavaTypedHandlerBase {
       while (parent instanceof PsiJavaCodeReferenceElement || parent instanceof PsiTypeElement);
       if (parent instanceof PsiParameterList list && PsiTreeUtil.isAncestor(list, lastElement, false) ||
           (parent instanceof PsiParameter && !(parent instanceof PsiPatternVariable))) {
-        if (ApplicationCommandCompletionService.getInstance().commandCompletionEnabled() &&
+        if (CommandCompletionSettingsService.getInstance().commandCompletionEnabled() &&
             parent instanceof PsiParameter parameter &&
             lastElement instanceof PsiJavaToken javaToken &&
             javaToken.textMatches(".") &&
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/command/configuration/ApplicationCommandCompletionService.kt b/platform/lang-impl/src/com/intellij/codeInsight/completion/command/configuration/ApplicationCommandCompletionService.kt
index 62580ace5786..d26c4c33f781 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/completion/command/configuration/ApplicationCommandCompletionService.kt
+++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/command/configuration/ApplicationCommandCompletionService.kt
@@ -17,8 +17,7 @@ import org.jetbrains.annotations.ApiStatus
 internal class ApplicationCommandCompletionService : PersistentStateComponent<AppCommandCompletionSettings> {
 
   companion object {
-    @JvmStatic
-    fun getInstance(): ApplicationCommandCompletionService = ApplicationManager.getApplication().getService(ApplicationCommandCompletionService::class.java)
+     internal fun getInstance(): ApplicationCommandCompletionService = ApplicationManager.getApplication().getService(ApplicationCommandCompletionService::class.java)
   }
 
   private var myState = AppCommandCompletionSettings()
@@ -34,6 +33,19 @@ internal class ApplicationCommandCompletionService : PersistentStateComponent<Ap
   }
 }
 
+@ApiStatus.Internal
+@Service(Service.Level.APP)
+class CommandCompletionSettingsService {
+  companion object {
+    @JvmStatic
+    fun getInstance(): CommandCompletionSettingsService = ApplicationManager.getApplication().getService(CommandCompletionSettingsService::class.java)
+  }
+
+  fun commandCompletionEnabled(): Boolean {
+    return ApplicationCommandCompletionService.getInstance().commandCompletionEnabled()
+  }
+}
+
 @ApiStatus.Internal
 internal class AppCommandCompletionSettings(
   var showCounts: Int = 0,