diff --git a/main.js b/main.js
index 21373b622..5ed65eac0 100644
--- a/main.js
+++ b/main.js
@@ -1091,18 +1091,20 @@ ipc.on('set-media-permissions', (event, value) => {
 });
 
 // Loki - Auto updating
-ipc.on('get-auto-update-enabled', event => {
+ipc.on('get-auto-update-setting', event => {
   const configValue = userConfig.get('autoUpdate');
   // eslint-disable-next-line no-param-reassign
   event.returnValue = typeof configValue !== 'boolean' ? true : configValue;
 });
 
-ipc.on('set-auto-update-enabled', (event, value) => {
-  userConfig.set('autoUpdate', !!value);
+ipc.on('set-auto-update-setting', (event, enabled) => {
+  userConfig.set('autoUpdate', !!enabled);
 
-  // Stop updater if user turned it off
-  if (!value) {
+  if (enabled) {
+    readyForUpdates();
+  } else {
     updater.stop();
+    isReadyForUpdates = false;
   }
 });
 
diff --git a/preload.js b/preload.js
index 6ad2ee75f..94fa47338 100644
--- a/preload.js
+++ b/preload.js
@@ -241,9 +241,9 @@ window.getMessageTTL = () => window.storage.get('message-ttl', 24);
 window.getMediaPermissions = () => ipc.sendSync('get-media-permissions');
 
 // Auto update setting
-window.getAutoUpdateEnabled = () => ipc.sendSync('get-auto-update-enabled');
+window.getAutoUpdateEnabled = () => ipc.sendSync('get-auto-update-setting');
 window.setAutoUpdateEnabled = value =>
-  ipc.send('set-auto-update-enabled', !!value);
+  ipc.send('set-auto-update-setting', !!value);
 
 ipc.on('get-ready-for-shutdown', async () => {
   const { shutdown } = window.Events || {};