diff --git a/src/SetupStore.js b/src/SetupStore.js
index d8e2b88661..22cd6346cc 100644
--- a/src/SetupStore.js
+++ b/src/SetupStore.js
@@ -67,9 +67,11 @@ var _steps = [{
     var exists = yield machine.exists();
     if (!exists) {
       yield machine.create();
+      return;
     } else if ((yield machine.state()) === 'Error') {
       yield machine.rm();
       yield machine.create();
+      return;
     }
 
     var isoversion = machine.isoversion();