diff --git a/css/index.css b/css/index.css
index abc7604..e293783 100644
--- a/css/index.css
+++ b/css/index.css
@@ -259,7 +259,7 @@ body {
 	color: #3f1f1f;
 }
 
-.host-field-wrapper .connection-status.cors-issue {
+.host-field-wrapper .connection-status.webui-issue {
 	background-color: #dddd49;
 	color: #3f3f1f;
 }
diff --git a/js/index.js b/js/index.js
index 7a3049d..13cdb4e 100644
--- a/js/index.js
+++ b/js/index.js
@@ -176,7 +176,7 @@ async function testHostConnection() {
 			online: () => {
 				connectionIndicator.classList.add("online");
 				connectionIndicator.classList.remove(
-					"cors-issue",
+					"webui-issue",
 					"offline",
 					"before",
 					"server-error"
@@ -191,7 +191,7 @@ async function testHostConnection() {
 					"online",
 					"offline",
 					"before",
-					"cors-issue"
+					"webui-issue"
 				);
 				connectionIndicatorText.textContent = "Error";
 				connectionIndicator.title =
@@ -199,7 +199,7 @@ async function testHostConnection() {
 				connectionStatus = false;
 			},
 			corsissue: () => {
-				connectionIndicator.classList.add("cors-issue");
+				connectionIndicator.classList.add("webui-issue");
 				connectionIndicator.classList.remove(
 					"online",
 					"offline",
@@ -211,10 +211,23 @@ async function testHostConnection() {
 					"Server is online, but CORS is blocking our requests";
 				connectionStatus = false;
 			},
+			apiissue: () => {
+				connectionIndicator.classList.add("webui-issue");
+				connectionIndicator.classList.remove(
+					"online",
+					"offline",
+					"before",
+					"server-error"
+				);
+				connectionIndicatorText.textContent = "API";
+				connectionIndicator.title =
+					"Server is online, but the API seems to be disabled";
+				connectionStatus = false;
+			},
 			offline: () => {
 				connectionIndicator.classList.add("offline");
 				connectionIndicator.classList.remove(
-					"cors-issue",
+					"webui-issue",
 					"online",
 					"before",
 					"server-error"
@@ -227,7 +240,7 @@ async function testHostConnection() {
 			before: () => {
 				connectionIndicator.classList.add("before");
 				connectionIndicator.classList.remove(
-					"cors-issue",
+					"webui-issue",
 					"online",
 					"offline",
 					"server-error"
@@ -254,27 +267,38 @@ async function testHostConnection() {
 		var url = document.getElementById("host").value + "/startup-events";
 		// Attempt normal request
 		try {
-			/** @type {Response} */
-			const response = await fetch(url, {
-				signal: AbortSignal.timeout(5000),
-			});
-
-			if (response.status === 200) {
-				setConnectionStatus("online");
-				// Load data as soon as connection is first stablished
-				if (firstTimeOnline) {
-					getConfig();
-					getStyles();
-					getSamplers();
-					getUpscalers();
-					getModels();
-					firstTimeOnline = false;
+			// Check if API is available
+			const response = await fetch(
+				document.getElementById("host").value + "/sdapi/v1/options",
+				{method: "OPTIONS"}
+			);
+			switch (response.status) {
+				case 200: {
+					setConnectionStatus("online");
+					// Load data as soon as connection is first stablished
+					if (firstTimeOnline) {
+						getConfig();
+						getStyles();
+						getSamplers();
+						getUpscalers();
+						getModels();
+						firstTimeOnline = false;
+					}
+					break;
+				}
+				case 404: {
+					setConnectionStatus("apiissue");
+					const message = `The host is online, but the API seems to be disabled. Have you run the webui with the flag --api?`;
+					console.error(message);
+					if (notify) alert(message);
+					break;
+				}
+				default: {
+					setConnectionStatus("offline");
+					const message = `The host is online, but the API seems to be disabled. Have you run the webui with the flag --api?`;
+					console.error(message);
+					if (notify) alert(message);
 				}
-			} else {
-				setConnectionStatus("error");
-				const message = `Server responded with ${response.status} - ${response.statusText}. Try running the webui with the flag '--api'`;
-				console.error(message);
-				if (notify) alert(message);
 			}
 		} catch (e) {
 			try {