diff --git a/browser/main/lib/ConfigManager.js b/browser/main/lib/ConfigManager.js
index 20799de5..ce641b9a 100644
--- a/browser/main/lib/ConfigManager.js
+++ b/browser/main/lib/ConfigManager.js
@@ -8,6 +8,7 @@ const win = global.process.platform === 'win32'
 const electron = require('electron')
 const { ipcRenderer } = electron
 const consts = require('browser/lib/consts')
+const electronConfig = new (require('electron-config'))()
 
 let isInitialized = false
 
@@ -26,6 +27,7 @@ export const DEFAULT_CONFIG = {
   sortTagsBy: 'ALPHABETICAL', // 'ALPHABETICAL', 'COUNTER'
   listStyle: 'DEFAULT', // 'DEFAULT', 'SMALL'
   amaEnabled: true,
+  autoUpdateEnabled: true,
   hotkey: {
     toggleMain: OSX ? 'Command + Alt + L' : 'Super + Alt + E',
     toggleMode: OSX ? 'Command + Alt + M' : 'Ctrl + M',
@@ -141,6 +143,8 @@ function get () {
     _save(config)
   }
 
+  config.autoUpdateEnabled = electronConfig.get('autoUpdateEnabled', config.autoUpdateEnabled)
+
   if (!isInitialized) {
     isInitialized = true
     let editorTheme = document.getElementById('editorTheme')
@@ -205,6 +209,8 @@ function set (updates) {
     editorTheme.setAttribute('href', newTheme.path)
   }
 
+  electronConfig.set('autoUpdateEnabled', newConfig.autoUpdateEnabled)
+
   ipcRenderer.send('config-renew', {
     config: get()
   })
diff --git a/browser/main/modals/PreferencesModal/InfoTab.js b/browser/main/modals/PreferencesModal/InfoTab.js
index 71e99da9..66250412 100644
--- a/browser/main/modals/PreferencesModal/InfoTab.js
+++ b/browser/main/modals/PreferencesModal/InfoTab.js
@@ -61,6 +61,15 @@ class InfoTab extends React.Component {
     })
   }
 
+  toggleAutoUpdate () {
+    const newConfig = {
+      autoUpdateEnabled: !this.state.config.autoUpdateEnabled
+    }
+
+    this.setState({ config: newConfig })
+    ConfigManager.set(newConfig)
+  }
+
   infoMessage () {
     const { amaMessage } = this.state
     return amaMessage ? <p styleName='policy-confirm'>{amaMessage}</p> : null
@@ -140,6 +149,8 @@ class InfoTab extends React.Component {
           </li>
         </ul>
 
+        <div><label><input type='checkbox' onChange={this.toggleAutoUpdate.bind(this)} checked={this.state.config.autoUpdateEnabled} />{i18n.__('Enable Auto Update')}</label></div>
+
         <hr styleName='separate-line' />
 
         <div styleName='group-header2--sub'>{i18n.__('Analytics')}</div>
diff --git a/lib/main-app.js b/lib/main-app.js
index 9a2c4e59..f8ee1ecf 100644
--- a/lib/main-app.js
+++ b/lib/main-app.js
@@ -4,6 +4,7 @@ const Menu = electron.Menu
 const ipc = electron.ipcMain
 const GhReleases = require('electron-gh-releases')
 const { isPackaged } = app
+const electronConfig = new (require('electron-config'))()
 // electron.crashReporter.start()
 const singleInstance = app.requestSingleInstanceLock()
 
@@ -40,6 +41,7 @@ function checkUpdate () {
     console.log('Updates are disabled in Development mode, see main-app.js')
     return true
   }
+  if (!electronConfig.get('autoUpdateEnabled', true)) return
   if (process.platform === 'linux' || isUpdateReady) {
     return true
   }
diff --git a/locales/en.json b/locales/en.json
index 7ad5e0b7..183bdaad 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -190,5 +190,6 @@
   "Show menu bar": "Show menu bar",
   "Auto Detect": "Auto Detect",
   "Enable HTML label in mermaid flowcharts": "Enable HTML label in mermaid flowcharts ⚠ This option potentially has a risk of XSS.",
-  "Wrap line in Snippet Note": "Wrap line in Snippet Note"
+  "Wrap line in Snippet Note": "Wrap line in Snippet Note",
+  "Enable Auto Update": "Enable Auto Update"
 }
diff --git a/tests/helpers/setup-electron-mock.js b/tests/helpers/setup-electron-mock.js
index dd6a9733..a236df1b 100644
--- a/tests/helpers/setup-electron-mock.js
+++ b/tests/helpers/setup-electron-mock.js
@@ -5,7 +5,8 @@ const noop = () => {}
 mock('electron', {
   remote: {
     app: {
-      getAppPath: noop
+      getAppPath: noop,
+      getPath: noop
     }
   }
 })