diff --git a/src/browser/components/UpdaterPage.jsx b/src/browser/components/UpdaterPage.jsx
index 6a5822bf..44d3a231 100644
--- a/src/browser/components/UpdaterPage.jsx
+++ b/src/browser/components/UpdaterPage.jsx
@@ -55,6 +55,11 @@ function UpdaterPage(props) {
             now={props.progress}
             label={`${props.progress}%`}
           />
+          <div className='pull-right'>
+            <Button
+              onClick={props.onClickCancel}
+            >{'Cancel'}</Button>
+          </div>
         </Navbar> :
         <Navbar
           className='UpdaterPage-footer'
@@ -93,6 +98,7 @@ UpdaterPage.propTypes = {
   onClickReleaseNotes: propTypes.func.isRequired,
   onClickRemind: propTypes.func.isRequired,
   onClickSkip: propTypes.func.isRequired,
+  onClickCancel: propTypes.func.isRequired,
 };
 
 export default UpdaterPage;
diff --git a/src/browser/components/UpdaterPage/UpdaterPage.stories.jsx b/src/browser/components/UpdaterPage/UpdaterPage.stories.jsx
index 1eb43abc..60212b57 100644
--- a/src/browser/components/UpdaterPage/UpdaterPage.stories.jsx
+++ b/src/browser/components/UpdaterPage/UpdaterPage.stories.jsx
@@ -48,5 +48,6 @@ storiesOf('UpdaterPage', module).
       appName={appName}
       isDownloading={true}
       progress={0}
+      onClickCancel={action('clicked cancel')}
     />
   ));
diff --git a/src/browser/updater.jsx b/src/browser/updater.jsx
index 5d9e9a4c..3503305c 100644
--- a/src/browser/updater.jsx
+++ b/src/browser/updater.jsx
@@ -53,6 +53,9 @@ class UpdaterPageContainer extends React.Component {
         onClickDownload={() => {
           ipcRenderer.send('click-download');
         }}
+        onClickCancel={() => {
+          ipcRenderer.send('click-cancel');
+        }}
       />
     );
   }
diff --git a/src/main/autoUpdater.js b/src/main/autoUpdater.js
index 8e71e39c..f24f8c0e 100644
--- a/src/main/autoUpdater.js
+++ b/src/main/autoUpdater.js
@@ -8,7 +8,7 @@ import path from 'path';
 import {app, BrowserWindow, dialog, ipcMain, shell} from 'electron';
 
 import logger from 'electron-log';
-import {autoUpdater} from 'electron-updater';
+import {autoUpdater, CancellationToken} from 'electron-updater';
 import semver from 'semver';
 
 const INTERVAL_48_HOURS_IN_MS = 5 * 60 * 1000; // 5 min.
@@ -55,7 +55,7 @@ function createUpdaterModal(parentWindow, options) {
   }
   modal.loadURL(updaterURL);
 
-  for (const eventName of ['click-release-notes', 'click-skip', 'click-remind', 'click-install', 'click-download']) {
+  for (const eventName of ['click-release-notes', 'click-skip', 'click-remind', 'click-install', 'click-download', 'click-cancel']) {
     const listener = createEventListener(modal, eventName);
     ipcMain.on(eventName, listener);
     modal.on('closed', () => {
@@ -82,12 +82,12 @@ function isUpdateApplicable(now, skippedVersion, updateInfo) {
   return true;
 }
 
-function downloadAndInstall() {
+function downloadAndInstall(cancellationToken) {
   autoUpdater.on('update-downloaded', () => {
     global.willAppQuit = true;
     autoUpdater.quitAndInstall();
   });
-  autoUpdater.downloadUpdate();
+  autoUpdater.downloadUpdate(cancellationToken);
 }
 
 function initialize(appState, mainWindow, notifyOnly = false) {
@@ -96,6 +96,7 @@ function initialize(appState, mainWindow, notifyOnly = false) {
   autoUpdater.on('error', (err) => {
     console.error('Error in autoUpdater:', err.message);
   }).on('update-available', (info) => {
+    let cancellationToken = null;
     if (isUpdateApplicable(new Date(), appState.skippedVersion, info)) {
       updaterModal = createUpdaterModal(mainWindow, {
         linuxAppIcon: path.join(assetsDir, 'appicon.png'),
@@ -119,11 +120,15 @@ function initialize(appState, mainWindow, notifyOnly = false) {
           updaterModal.send('progress', Math.floor(data.percent));
           console.log('progress:', data);
         });
-        downloadAndInstall();
+        cancellationToken = new CancellationToken();
+        downloadAndInstall(cancellationToken);
       }).on('click-download', () => {
         shell.openExternal('https://about.mattermost.com/download/#mattermostApps');
       }).on('click-release-notes', () => {
         shell.openExternal(`https://github.com/mattermost/desktop/releases/v${info.version}`);
+      }).on('click-cancel', () => {
+        cancellationToken.cancel();
+        updaterModal.close();
       });
       updaterModal.focus();
     } else if (autoUpdater.isManual) {