diff --git a/src/main/java/ee/carlrobert/codegpt/settings/GeneralSettings.java b/src/main/java/ee/carlrobert/codegpt/settings/GeneralSettings.java
index d6ca6070..56d9ba3c 100644
--- a/src/main/java/ee/carlrobert/codegpt/settings/GeneralSettings.java
+++ b/src/main/java/ee/carlrobert/codegpt/settings/GeneralSettings.java
@@ -51,6 +51,9 @@ public class GeneralSettings implements PersistentStateComponent<GeneralSettings
     if ("azure.chat.completion".equals(clientCode)) {
       state.setSelectedService(ServiceType.AZURE);
     }
+    if ("custom.openai.chat.completion".equals(clientCode)) {
+      state.setSelectedService(ServiceType.CUSTOM_OPENAI);
+    }
     if ("llama.chat.completion".equals(clientCode)) {
       state.setSelectedService(ServiceType.LLAMA_CPP);
       var llamaSettings = LlamaSettings.getCurrentState();
diff --git a/src/test/kotlin/ee/carlrobert/codegpt/settings/state/GeneralSettingsTest.kt b/src/test/kotlin/ee/carlrobert/codegpt/settings/state/GeneralSettingsTest.kt
index 748f466e..0dcd609c 100644
--- a/src/test/kotlin/ee/carlrobert/codegpt/settings/state/GeneralSettingsTest.kt
+++ b/src/test/kotlin/ee/carlrobert/codegpt/settings/state/GeneralSettingsTest.kt
@@ -25,6 +25,17 @@ class GeneralSettingsTest : BasePlatformTestCase() {
     assertThat(openAISettings.model).isEqualTo("gpt-4")
   }
 
+  fun testCustomOpenAISettingsSync() {
+    val conversation = Conversation()
+    conversation.clientCode = "custom.openai.chat.completion"
+    val settings = GeneralSettings.getInstance()
+    settings.state.selectedService = ServiceType.OPENAI
+
+    settings.sync(conversation)
+
+    assertThat(settings.state.selectedService).isEqualTo(ServiceType.CUSTOM_OPENAI)
+  }
+
   fun testAzureSettingsSync() {
     val settings = GeneralSettings.getInstance()
     val conversation = Conversation()