diff --git a/src/Umbraco.Web/Net/AspNetHttpContextAccessor.cs b/src/Umbraco.Web/Net/AspNetHttpContextAccessor.cs
index c7270a8259..5d306e0692 100644
--- a/src/Umbraco.Web/Net/AspNetHttpContextAccessor.cs
+++ b/src/Umbraco.Web/Net/AspNetHttpContextAccessor.cs
@@ -9,7 +9,8 @@ namespace Umbraco.Web
         {
             get
             {
-                return new HttpContextWrapper(System.Web.HttpContext.Current);
+                var httpContext = System.Web.HttpContext.Current;
+                return httpContext is null ? null : new HttpContextWrapper(httpContext);
             }
             set
             {