diff --git a/platform/lang-impl/resources/intellij.platform.lang.impl.xml b/platform/lang-impl/resources/intellij.platform.lang.impl.xml
index 92d3cee39ace..a2c03272dfaf 100644
--- a/platform/lang-impl/resources/intellij.platform.lang.impl.xml
+++ b/platform/lang-impl/resources/intellij.platform.lang.impl.xml
@@ -74,5 +74,9 @@
     <completion.frontendFriendlyPrefixMatcher target="com.intellij.codeInsight.completion.impl.BetterPrefixMatcher$AutoRestarting"
                                               converter="com.intellij.codeInsight.completion.impl.BetterPrefixMatcher$AutoRestarting$Converter"
                                               descriptor="com.intellij.codeInsight.completion.impl.BetterPrefixMatcher$AutoRestarting$Descriptor"/>
+
+    <applicationService serviceImplementation="com.intellij.codeInsight.completion.command.configuration.ApplicationCommandCompletionService"/>
+    <applicationSettings service="com.intellij.codeInsight.completion.command.configuration.ApplicationCommandCompletionService"/>
+
   </extensions>
 </idea-plugin>
\ No newline at end of file
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 1c876d1a519a..67d57c1e24bc 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
@@ -1,4 +1,4 @@
-// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.codeInsight.completion.command.configuration
 
 import com.intellij.openapi.application.ApplicationManager
@@ -8,6 +8,7 @@ import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.SettingsCategory
 import com.intellij.openapi.components.State
 import com.intellij.openapi.components.Storage
+import com.intellij.openapi.components.service
 import com.intellij.openapi.util.registry.Registry
 import com.intellij.util.PlatformUtils
 import org.jetbrains.annotations.ApiStatus
@@ -17,16 +18,21 @@ import org.jetbrains.annotations.TestOnly
 /**
  * Service responsible for managing and persisting command completion settings at the application level.
  */
-@Service(Service.Level.APP)
-@ApiStatus.Internal
-@State(name = "CommandCompletion", category = SettingsCategory.UI, storages = [Storage("CommandCompletion.xml", roamingType = RoamingType.DISABLED)])
+@State(
+  name = "CommandCompletion",
+  category = SettingsCategory.UI,
+  storages = [
+    Storage(value = "CommandCompletion.xml", roamingType = RoamingType.DEFAULT)
+  ]
+)
 internal class ApplicationCommandCompletionService : PersistentStateComponent<AppCommandCompletionSettings> {
-
   companion object {
-     internal fun getInstance(): ApplicationCommandCompletionService = ApplicationManager.getApplication().getService(ApplicationCommandCompletionService::class.java)
+    fun getInstance(): ApplicationCommandCompletionService = service<ApplicationCommandCompletionService>()
+
+    private fun initialState(): AppCommandCompletionSettings = AppCommandCompletionSettings()
   }
 
-  private var myState = AppCommandCompletionSettings()
+  private var myState = initialState()
 
   override fun getState(): AppCommandCompletionSettings = myState
 
@@ -34,6 +40,10 @@ internal class ApplicationCommandCompletionService : PersistentStateComponent<Ap
     myState = state
   }
 
+  override fun noStateLoaded() {
+    loadState(initialState())
+  }
+
   fun commandCompletionEnabled(): Boolean {
     return myState.isEnabled()
   }
@@ -52,7 +62,7 @@ internal class ApplicationCommandCompletionService : PersistentStateComponent<Ap
 class CommandCompletionSettingsService {
   companion object {
     @JvmStatic
-    fun getInstance(): CommandCompletionSettingsService = ApplicationManager.getApplication().getService(CommandCompletionSettingsService::class.java)
+    fun getInstance(): CommandCompletionSettingsService = service<CommandCompletionSettingsService>()
   }
 
   fun commandCompletionEnabled(): Boolean {