diff --git a/src/background/index.mjs b/src/background/index.mjs
index 00bab8c..e2ef85b 100644
--- a/src/background/index.mjs
+++ b/src/background/index.mjs
@@ -83,7 +83,7 @@ async function executeApi(session, port, config) {
         port,
         session.question,
         session,
-        config.customModelApiUrl,
+        config.customModelApiUrl.trim() || 'http://localhost:8000/v1/chat/completions',
         config.customApiKey,
         config.customModelName,
       )
@@ -92,7 +92,7 @@ async function executeApi(session, port, config) {
         port,
         session.question,
         session,
-        session.apiMode.customUrl,
+        session.apiMode.customUrl.trim() || 'http://localhost:8000/v1/chat/completions',
         session.apiMode.apiKey,
         session.apiMode.customName,
       )
diff --git a/src/popup/sections/GeneralPart.jsx b/src/popup/sections/GeneralPart.jsx
index 3cbff3f..3db270c 100644
--- a/src/popup/sections/GeneralPart.jsx
+++ b/src/popup/sections/GeneralPart.jsx
@@ -88,6 +88,10 @@ async function checkBilling(apiKey, apiUrl) {
   }
 }
 
+function isUsingSpecialCustomModel(configOrSession) {
+  return isUsingCustomModel(configOrSession) && !configOrSession.apiMode
+}
+
 export function GeneralPart({ config, updateConfig, setTabIndex }) {
   const { t, i18n } = useTranslation()
   const [balance, setBalance] = useState(null)
@@ -173,7 +177,7 @@ export function GeneralPart({ config, updateConfig, setTabIndex }) {
             style={
               isUsingOpenAiApiModel(config) ||
               isUsingMultiModeModel(config) ||
-              isUsingCustomModel(config) ||
+              isUsingSpecialCustomModel(config) ||
               isUsingAzureOpenAiApiModel(config) ||
               isUsingClaudeApiModel(config) ||
               isUsingMoonshotApiModel(config)
@@ -255,7 +259,7 @@ export function GeneralPart({ config, updateConfig, setTabIndex }) {
               )}
             </span>
           )}
-          {isUsingCustomModel(config) && (
+          {isUsingSpecialCustomModel(config) && (
             <input
               style="width: 50%;"
               type="text"
@@ -328,7 +332,7 @@ export function GeneralPart({ config, updateConfig, setTabIndex }) {
             </span>
           )}
         </span>
-        {isUsingCustomModel(config) && (
+        {isUsingSpecialCustomModel(config) && (
           <input
             type="text"
             value={config.customModelApiUrl}
@@ -339,7 +343,7 @@ export function GeneralPart({ config, updateConfig, setTabIndex }) {
             }}
           />
         )}
-        {isUsingCustomModel(config) && (
+        {isUsingSpecialCustomModel(config) && (
           <input
             type="password"
             value={config.customApiKey}
@@ -424,17 +428,6 @@ export function GeneralPart({ config, updateConfig, setTabIndex }) {
             }}
           />
         )}
-        {isUsingAzureOpenAiApiModel(config) && (
-          <input
-            type="text"
-            value={config.azureDeploymentName}
-            placeholder={t('Azure Deployment Name')}
-            onChange={(e) => {
-              const deploymentName = e.target.value
-              updateConfig({ azureDeploymentName: deploymentName })
-            }}
-          />
-        )}
         {isUsingGithubThirdPartyApiModel(config) && (
           <input
             type="text"
diff --git a/src/services/wrappers.mjs b/src/services/wrappers.mjs
index 5b29193..c828f90 100644
--- a/src/services/wrappers.mjs
+++ b/src/services/wrappers.mjs
@@ -102,7 +102,7 @@ export function registerPortListener(executor) {
       if (!session) return
       const config = await getUserConfig()
       if (!session.modelName) session.modelName = config.modelName
-      if (!session.apiMode) session.apiMode = config.apiMode
+      if (!session.apiMode && session.modelName !== 'customModel') session.apiMode = config.apiMode
       if (!session.aiName)
         session.aiName = modelNameToDesc(
           session.apiMode ? apiModeToModelName(session.apiMode) : session.modelName,