diff --git a/src/Orchard/Mvc/MvcModule.cs b/src/Orchard/Mvc/MvcModule.cs
index a10474b24..0bcd1c9a5 100644
--- a/src/Orchard/Mvc/MvcModule.cs
+++ b/src/Orchard/Mvc/MvcModule.cs
@@ -53,6 +53,12 @@ namespace Orchard.Mvc {
             // thus preventing a StackOverflowException.
             var baseUrl = new Func<string>(() => siteService.GetSiteSettings().BaseUrl);
             var httpContextBase = context.Resolve<IHttpContextAccessor>().Current();
+
+            if (httpContextBase == null) {
+                context.Resolve<IWorkContextAccessor>().CreateWorkContextScope();
+                return context.Resolve<IHttpContextAccessor>().Current();
+            }
+            
             context.Resolve<IWorkContextAccessor>().CreateWorkContextScope(httpContextBase);
             return httpContextBase;
         }