5 files changed, 14 insertions, 6 deletions

diff --git a/package.json b/package.json
index 34190047b..d6b11ec96 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,7 @@
     "cz-conventional-changelog": "^2.0.0",
     "del": "^2.2.2",
     "dotenv": "^4.0.0",
-    "electron": "^1.7.9",
+    "electron": "^1.7.12",
     "electron-builder": "19.15.1",
     "electron-packager": "^8.7.0",
     "electron-rebuild": "^1.6.0",
diff --git a/src/models/Service.js b/src/models/Service.js
index 423510c7d..bafb3f564 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -6,6 +6,7 @@ export default class Service {
   id = '';
   recipe = '';
   webview = null;
+  timer = null;
   events: {};
 
   isAttached = false;
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 20e07e540..99ffe5439 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -589,12 +589,16 @@ export default class ServicesStore extends Store {
     const delay = 1000;
 
     if (service) {
+      if (service.timer !== null) {
+        clearTimeout(service.timer);
+      }
+
       const loop = () => {
         if (!service.webview) return;
 
         service.webview.send('poll');
 
-        setTimeout(loop, delay);
+        service.timer = setTimeout(loop, delay);
       };
 
       loop();
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index 09000dcdb..427b6454b 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -2,6 +2,7 @@ import { observable, computed, action } from 'mobx';
 import moment from 'moment';
 import jwt from 'jsonwebtoken';
 
+import { isDevMode } from '../environment';
 import Store from './lib/Store';
 import Request from './lib/Request';
 import CachedRequest from './lib/CachedRequest';
@@ -237,7 +238,9 @@ export default class UserStore extends Store {
       && currentRoute.includes(this.BASE_ROUTE)
       && (this.hasCompletedSignup
         || this.hasCompletedSignup === null)) {
-      this.stores.router.push('/');
+      if (!isDevMode) {
+        this.stores.router.push('/');
+      }
     }
   };
 
diff --git a/yarn.lock b/yarn.lock
index 537c5dc5a..834d4eb20 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2066,9 +2066,9 @@ electron-window-state@^4.1.0:
     jsonfile "^2.2.3"
     mkdirp "^0.5.1"
 
-electron@^1.7.9:
-  version "1.7.9"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-1.7.9.tgz#add54e9f8f83ed02f6519ec10135f698b19336cf"
+electron@^1.7.12:
+  version "1.7.12"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-1.7.12.tgz#dcc61a2c1b0c3df25f68b3425379a01abd01190e"
   dependencies:
     "@types/node" "^7.0.18"
     electron-download "^3.0.1"