diff --git a/ui/desktop/src/components/settings/ProviderSetupModal.tsx b/ui/desktop/src/components/settings/ProviderSetupModal.tsx
index 29e4204b6a..ad643e926c 100644
--- a/ui/desktop/src/components/settings/ProviderSetupModal.tsx
+++ b/ui/desktop/src/components/settings/ProviderSetupModal.tsx
@@ -3,7 +3,7 @@ import { Card } from '../ui/card';
 import { Lock } from 'lucide-react';
 import { Input } from '../ui/input';
 import { Button } from '../ui/button';
-import { required_keys } from './models/hardcoded_stuff';
+import { required_keys, default_key_value } from './models/hardcoded_stuff';
 import { isSecretKey } from './api_keys/utils';
 import { OllamaBattleGame } from './OllamaBattleGame';
 
@@ -26,7 +26,9 @@ export function ProviderSetupModal({
   onCancel,
   forceBattle = false,
 }: ProviderSetupModalProps) {
-  const [configValues, setConfigValues] = React.useState<{ [key: string]: string }>({});
+  const [configValues, setConfigValues] = React.useState<{ [key: string]: string }>(
+    default_key_value
+  );
   const requiredKeys = required_keys[provider] || ['API Key'];
   const headerText = title || `Setup ${provider}`;
 
diff --git a/ui/desktop/src/components/settings/api_keys/utils.tsx b/ui/desktop/src/components/settings/api_keys/utils.tsx
index dc8805eb61..74f3776dcf 100644
--- a/ui/desktop/src/components/settings/api_keys/utils.tsx
+++ b/ui/desktop/src/components/settings/api_keys/utils.tsx
@@ -6,6 +6,7 @@ export function isSecretKey(keyName: string): boolean {
   const nonSecretKeys = [
     'DATABRICKS_HOST',
     'OLLAMA_HOST',
+    'OPENAI_HOST',
     'AZURE_OPENAI_ENDPOINT',
     'AZURE_OPENAI_DEPLOYMENT_NAME',
   ];
diff --git a/ui/desktop/src/components/settings/models/hardcoded_stuff.tsx b/ui/desktop/src/components/settings/models/hardcoded_stuff.tsx
index 36867007a3..b38840153c 100644
--- a/ui/desktop/src/components/settings/models/hardcoded_stuff.tsx
+++ b/ui/desktop/src/components/settings/models/hardcoded_stuff.tsx
@@ -75,6 +75,11 @@ export const required_keys = {
   'Azure OpenAI': ['AZURE_OPENAI_API_KEY', 'AZURE_OPENAI_ENDPOINT', 'AZURE_OPENAI_DEPLOYMENT_NAME'],
 };
 
+export const default_key_value = {
+  OPENAI_HOST: 'https://api.openai.com',
+  OLLAMA_HOST: 'localhost',
+};
+
 export const supported_providers = [
   'OpenAI',
   'Anthropic',