diff --git a/src/Orchard/Environment/DefaultOrchardHost.cs b/src/Orchard/Environment/DefaultOrchardHost.cs
index 2e10d25d2..977515317 100644
--- a/src/Orchard/Environment/DefaultOrchardHost.cs
+++ b/src/Orchard/Environment/DefaultOrchardHost.cs
@@ -143,6 +143,10 @@ namespace Orchard.Environment {
                     catch (Exception e) {
                         Logger.Error(e, "A tenant could not be started: " + settings.Name);
                     }
+                    while (_processingEngine.AreTasksPending()) {
+                        Logger.Debug("Processing pending task after activate Shell");
+                        _processingEngine.ExecuteNextTask();
+                    }
                 });
             }
             // no settings, run the Setup