diff --git a/pkg/service/handlers/web/index.html b/pkg/service/handlers/web/index.html
index 7a52d68..143bbfd 100644
--- a/pkg/service/handlers/web/index.html
+++ b/pkg/service/handlers/web/index.html
@@ -216,7 +216,7 @@
             <strong>Device Discovery:</strong>
             <div style="margin-top: 5px">
                 <label style="display: block; margin-bottom: 5px">
-                    <input type="checkbox" id="discovery-enabled"/> Enable Automated Discovery
+                    <input type="checkbox" id="discovery-enabled"/> Enable Periodic Discovery
                 </label>
                 <div style="margin-left: 20px">
                     <label for="discovery-interval">Discovery Interval:</label>
diff --git a/pkg/service/handlers/web/js/script.js b/pkg/service/handlers/web/js/script.js
index d934f83..baa9e48 100644
--- a/pkg/service/handlers/web/js/script.js
+++ b/pkg/service/handlers/web/js/script.js
@@ -382,6 +382,7 @@ async function fetchSettings() {
 
         fetchLoggingSettings();
         fetchSpotifyStatus();
+        return settings;
     } catch (error) {
         console.error("Failed to fetch settings", error);
     }
@@ -1665,8 +1666,10 @@ function formatXML(xml) {
 }
 
 document.addEventListener("DOMContentLoaded", async () => {
-    fetchSettings();
-    triggerDiscovery();
+    const cfg = await fetchSettings();
+    if (cfg?.discovery_enabled !== false) {
+        triggerDiscovery();
+    }
     fetchVersion();
     await fetchDevices();
 
@@ -4051,10 +4054,12 @@ async function applyCustomPlan() {
     }
 }
 
-document.addEventListener("DOMContentLoaded", () => {
+document.addEventListener("DOMContentLoaded", async () => {
     fetchDevices();
-    fetchSettings();
-    triggerDiscovery();
+    const cfg = await fetchSettings();
+    if (cfg?.discovery_enabled !== false) {
+        triggerDiscovery();
+    }
 });
 
 // ---------------------------------------------------------------------------