diff --git a/src/Orchard/Mvc/HttpContextAccessor.cs b/src/Orchard/Mvc/HttpContextAccessor.cs
index ffea8ca66..667858dc3 100644
--- a/src/Orchard/Mvc/HttpContextAccessor.cs
+++ b/src/Orchard/Mvc/HttpContextAccessor.cs
@@ -10,9 +10,9 @@ namespace Orchard.Mvc {
         }
 
         public HttpContextBase Current() {
-            HttpContextBase httpContextBase;
-            _context.TryResolve(out httpContextBase);
-            return httpContextBase;
+            // TODO: HttpContextBase is not registred in the "shell" lifetime scope, so resolving it will cause an exception.
+            
+            return HttpContext.Current != null ? new HttpContextWrapper(HttpContext.Current) : null;
         }
     }
 }
\ No newline at end of file