diff --git a/electron/index.js b/electron/index.js
index b7143b87a..9671a6eb2 100644
--- a/electron/index.js
+++ b/electron/index.js
@@ -34,6 +34,7 @@ try {
   upgradeDisabled = false;
 }
 autoUpdater.autoDownload = !upgradeDisabled;
+autoUpdater.allowPrerelease = false;
 
 // This is set to true if an auto update has been downloaded through the Electron
 // auto-update system and is ready to install. If the user declined an update earlier,
diff --git a/ui/index.jsx b/ui/index.jsx
index 07bed7a94..b31b4e418 100644
--- a/ui/index.jsx
+++ b/ui/index.jsx
@@ -213,6 +213,8 @@ function AppWrapper() {
       const enabled = makeSelectClientSetting(SETTINGS.ENABLE_PRERELEASE_UPDATES)(state);
       if (enabled) {
         autoUpdater.allowPrerelease = true;
+      } else {
+        autoUpdater.allowPrerelease = false;
       }
     }
   }, [persistDone]);