diff --git a/package.json b/package.json
index f20d85264c..d3d81e2e2f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Kitematic",
-  "version": "0.5.16",
+  "version": "0.5.17",
   "author": "Kitematic",
   "description": "Simple Docker Container management for Mac OS X.",
   "homepage": "https://kitematic.com/",
diff --git a/src/Main.js b/src/Main.js
index 9f582f3588..9637fce357 100644
--- a/src/Main.js
+++ b/src/Main.js
@@ -44,8 +44,8 @@ SetupStore.setup().then(() => {
   bugsnag.notify(err);
 });
 
-ipc.on('application:quitting', opts => {
-  if (!opts.updating && localStorage.getItem('settings.closeVMOnQuit') === 'true') {
+ipc.on('application:quitting', () => {
+  if (localStorage.getItem('settings.closeVMOnQuit') === 'true') {
     machine.stop();
   }
 });
diff --git a/src/browser.js b/src/browser.js
index 8722673dcb..2eafbf8e5c 100644
--- a/src/browser.js
+++ b/src/browser.js
@@ -45,9 +45,9 @@ app.on('ready', function () {
   });
 
   app.on('before-quit', function () {
-    mainWindow.webContents.send('application:quitting', {
-      updating: updating
-    });
+    if (!updating) {
+      mainWindow.webContents.send('application:quitting');
+    }
   });
 
   mainWindow.webContents.on('new-window', function (e) {