diff --git a/backend/apps/images/main.py b/backend/apps/images/main.py
index 4521706d..998af3dd 100644
--- a/backend/apps/images/main.py
+++ b/backend/apps/images/main.py
@@ -62,16 +62,16 @@ async def get_openai_url(user=Depends(get_admin_user)):
 
 @app.post("/url/update")
 async def update_openai_url(form_data: UrlUpdateForm, user=Depends(get_admin_user)):
-    try:
-        r = requests.head(form_data.url)
-        if r.ok:
-            app.state.AUTOMATIC1111_BASE_URL = form_data.url.strip("/")
-        return {
-            "AUTOMATIC1111_BASE_URL": app.state.AUTOMATIC1111_BASE_URL,
-            "status": True,
-        }
-    except Exception as e:
-        raise HTTPException(status_code=r.status_code, detail=ERROR_MESSAGES.DEFAULT(e))
+
+    if form_data.url == "":
+        app.state.AUTOMATIC1111_BASE_URL = AUTOMATIC1111_BASE_URL
+    else:
+        app.state.AUTOMATIC1111_BASE_URL = form_data.url.strip("/")
+
+    return {
+        "AUTOMATIC1111_BASE_URL": app.state.AUTOMATIC1111_BASE_URL,
+        "status": True,
+    }
 
 
 @app.get("/models")
diff --git a/src/lib/components/chat/Settings/Images.svelte b/src/lib/components/chat/Settings/Images.svelte
index 5cea4c8f..9b4b60cd 100644
--- a/src/lib/components/chat/Settings/Images.svelte
+++ b/src/lib/components/chat/Settings/Images.svelte
@@ -25,6 +25,14 @@
 	let selectedModel = '';
 	let models = [];
 
+	const getModels = async () => {
+		models = await getDiffusionModels(localStorage.token).catch((error) => {
+			toast.error(error);
+			return null;
+		});
+		selectedModel = await getDefaultDiffusionModel(localStorage.token);
+	};
+
 	const updateAUTOMATIC1111UrlHandler = async () => {
 		const res = await updateAUTOMATIC1111Url(localStorage.token, AUTOMATIC1111_BASE_URL).catch(
 			(error) => {
@@ -34,11 +42,13 @@
 		);
 
 		if (res) {
-			toast.success('Server connection verified');
 			AUTOMATIC1111_BASE_URL = res;
 
-			models = await getDiffusionModels(localStorage.token);
-			selectedModel = await getDefaultDiffusionModel(localStorage.token);
+			await getModels();
+
+			if (models) {
+				toast.success('Server connection verified');
+			}
 		} else {
 			AUTOMATIC1111_BASE_URL = await getAUTOMATIC1111Url(localStorage.token);
 		}
@@ -46,8 +56,17 @@
 
 	const toggleImageGeneration = async () => {
 		if (AUTOMATIC1111_BASE_URL) {
-			enableImageGeneration = await toggleImageGenerationEnabledStatus(localStorage.token);
-			config.set(await getBackendConfig(localStorage.token));
+			enableImageGeneration = await toggleImageGenerationEnabledStatus(localStorage.token).catch(
+				(error) => {
+					toast.error(error);
+					return false;
+				}
+			);
+
+			if (enableImageGeneration) {
+				config.set(await getBackendConfig(localStorage.token));
+				getModels();
+			}
 		} else {
 			enableImageGeneration = false;
 			toast.error('AUTOMATIC1111_BASE_URL not provided');
@@ -59,9 +78,8 @@
 			enableImageGeneration = await getImageGenerationEnabledStatus(localStorage.token);
 			AUTOMATIC1111_BASE_URL = await getAUTOMATIC1111Url(localStorage.token);
 
-			if (AUTOMATIC1111_BASE_URL) {
-				models = await getDiffusionModels(localStorage.token);
-				selectedModel = await getDefaultDiffusionModel(localStorage.token);
+			if (enableImageGeneration && AUTOMATIC1111_BASE_URL) {
+				getModels();
 			}
 		}
 	});