diff --git a/src/SetupStore.js b/src/SetupStore.js
index a0116a3ff9..b91770fff9 100644
--- a/src/SetupStore.js
+++ b/src/SetupStore.js
@@ -85,8 +85,11 @@ var _steps = [{
       yield machine.stop();
       yield machine.upgrade();
     }
-    yield machine.start();
-    yield machine.regenerateCerts();
+    var state = yield machine.state();
+    if (state !== 'Running') {
+      yield machine.start();
+      yield machine.regenerateCerts();
+    }
   })
 }];