diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
index b2120e144..64f049e63 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
@@ -150,7 +150,6 @@ namespace Orchard.Setup.Services {
                 }
             }
 
-            _shellSettingsManager.SaveSettings(shellSettings);
 
 
             // in effect "pump messages" see PostMessage circa 1980
@@ -173,10 +172,7 @@ namespace Orchard.Setup.Services {
                 }
             }
 
-            //// execute pending recipe steps
-            //while (_processingEngine.AreTasksPending())
-            //    _processingEngine.ExecuteNextTask();
-
+            _shellSettingsManager.SaveSettings(shellSettings);
  
             return executionId;
         }