diff --git a/app/src/electron.js b/app/src/electron.js
index e41571049..08702e6e9 100644
--- a/app/src/electron.js
+++ b/app/src/electron.js
@@ -29,6 +29,7 @@ let mainModule;
 // let getLogger;
 // let loadLogsContent;
 let appUpdateStatus = '';
+let settingsJson = {};
 
 process.on('uncaughtException', function (error) {
   console.error('uncaughtException', error);
@@ -285,6 +286,7 @@ ipcMain.on('applyUpdate', async (event, url) => {
   autoUpdater.quitAndInstall(false, true);
 });
 ipcMain.on('check-for-updates', async (event, url) => {
+  autoUpdater.autoDownload = false;
   autoUpdater.checkForUpdates();
 });
 
@@ -324,7 +326,6 @@ function ensureBoundsVisible(bounds) {
 function createWindow() {
   const datadir = path.join(os.homedir(), '.dbgate');
 
-  let settingsJson = {};
   try {
     settingsJson = fillMissingSettings(
       JSON.parse(fs.readFileSync(path.join(datadir, 'settings.json'), { encoding: 'utf-8' }))
@@ -485,8 +486,10 @@ autoUpdater.on('error', error => {
 
 function onAppReady() {
   if (!process.env.DEVMODE) {
-    autoUpdater.autoDownload = false;
-    autoUpdater.checkForUpdates();
+    if (settingsJson['app.autoUpdateMode'] != 'skip') {
+      autoUpdater.autoDownload = settingsJson['app.autoUpdateMode'] == 'download';
+      autoUpdater.checkForUpdates();
+    }
   }
   createWindow();
 }
diff --git a/packages/web/src/settings/SettingsModal.svelte b/packages/web/src/settings/SettingsModal.svelte
index 5f384e00e..6b36c9421 100644
--- a/packages/web/src/settings/SettingsModal.svelte
+++ b/packages/web/src/settings/SettingsModal.svelte
@@ -342,6 +342,18 @@ ORDER BY
           <div class="heading">Other</div>
 
           <FormTextField name="other.gistCreateToken" label="API token for creating error gists" defaultValue="" />
+
+          <FormSelectField
+            label="Auto update application"
+            name="app.autoUpdateMode"
+            isNative
+            defaultValue=""
+            options={[
+              { value: 'skip', label: 'Do not check for new versions' },
+              { value: '', label: 'Check for new versions' },
+              { value: 'download', label: 'Check and download new versions' },
+            ]}
+          />
         </svelte:fragment>
 
         <svelte:fragment slot="7">