diff --git a/interface/src/app/settings/Version.tsx b/interface/src/app/settings/Version.tsx
index 2855c8684..dacd284c2 100644
--- a/interface/src/app/settings/Version.tsx
+++ b/interface/src/app/settings/Version.tsx
@@ -42,7 +42,9 @@ const Version = () => {
     }
   ).onSuccess((event) => {
     const data = event.data as { emsesp_version: string; upgradeable: boolean };
-    setUpgradeAvailable(data.upgradeable);
+    if (data.upgradeable != undefined) {
+      setUpgradeAvailable(data.upgradeable);
+    }
   });
 
   const { data, send: loadData, error } = useRequest(SystemApi.readSystemStatus);
@@ -60,9 +62,7 @@ const Version = () => {
     // immediate: false,
     // initialData: '3.6.5'
   }).onSuccess((event) => {
-    if (!useDev) {
-      void sendCheckUpgrade(event.data);
-    }
+    void sendCheckUpgrade(event.data);
   });
 
   // called immediately to get the latest version, on page load, then check for upgrade (works for both dev and stable)
@@ -71,9 +71,7 @@ const Version = () => {
     // immediate: false,
     // initialData: '3.7.0-dev.32'
   }).onSuccess((event) => {
-    if (useDev) {
-      void sendCheckUpgrade(event.data);
-    }
+    void sendCheckUpgrade(event.data);
   });
 
   const STABLE_URL = 'https://github.com/emsesp/EMS-ESP32/releases/download/';
diff --git a/src/web/WebStatusService.cpp b/src/web/WebStatusService.cpp
index 4c15f0227..1c5d175d8 100644
--- a/src/web/WebStatusService.cpp
+++ b/src/web/WebStatusService.cpp
@@ -214,7 +214,10 @@ bool WebStatusService::checkUpgrade(JsonObject root, std::string & latest_versio
         version::Semver200_version settings_version(EMSESP_APP_VERSION);
         version::Semver200_version this_version(latest_version);
 
-        root["upgradeable"] = (this_version > settings_version);
+        if ((this_version.prerelease().empty() && settings_version.prerelease().empty())
+            || (!this_version.prerelease().empty() && !settings_version.prerelease().empty())) {
+            root["upgradeable"] = (this_version > settings_version);
+        }
     }
 
     return true; // always ok