diff --git a/src/api/providers/fetchers/watsonx.ts b/src/api/providers/fetchers/watsonx.ts
index 568639ed9d..3087dd1bca 100644
--- a/src/api/providers/fetchers/watsonx.ts
+++ b/src/api/providers/fetchers/watsonx.ts
@@ -26,7 +26,6 @@ export async function getWatsonxModels(
 	try {
 		let options: any = {
 			version: "2024-05-31",
-			serviceUrl: baseUrl || "https://us-south.ml.cloud.ibm.com",
 		}
 
 		if (platform === "ibmCloud" || !platform) {
diff --git a/webview-ui/src/components/chat/CodeIndexPopover.tsx b/webview-ui/src/components/chat/CodeIndexPopover.tsx
index 506d769925..61f5405149 100644
--- a/webview-ui/src/components/chat/CodeIndexPopover.tsx
+++ b/webview-ui/src/components/chat/CodeIndexPopover.tsx
@@ -1296,7 +1296,11 @@ export const CodeIndexPopover: React.FC<CodeIndexPopoverProps> = ({
 													<div className="space-y-2">
 														<label className="text-sm font-medium">Username</label>
 														<VSCodeTextField
-															value={currentSettings.watsonxUsername || ""}
+															value={
+																currentSettings.watsonxUsername
+																	? currentSettings.watsonxUsername
+																	: ""
+															}
 															onInput={(e: any) =>
 																updateSetting("watsonxUsername", e.target.value)
 															}
diff --git a/webview-ui/src/components/settings/providers/WatsonxAI.tsx b/webview-ui/src/components/settings/providers/WatsonxAI.tsx
index 0963216101..4999f5b531 100644
--- a/webview-ui/src/components/settings/providers/WatsonxAI.tsx
+++ b/webview-ui/src/components/settings/providers/WatsonxAI.tsx
@@ -318,7 +318,7 @@ export const WatsonxAI = ({
 					</div>
 
 					<VSCodeTextField
-						value={apiConfiguration.watsonxUsername}
+						value={apiConfiguration.watsonxUsername ? apiConfiguration.watsonxUsername : ""}
 						onInput={handleInputChange("watsonxUsername")}
 						placeholder="Username"
 						className="w-full">