diff --git a/BTCPayServer/Controllers/GreenField/LocalBTCPayServerClient.cs b/BTCPayServer/Controllers/GreenField/LocalBTCPayServerClient.cs
index 7a1e1283e..58d2ae49f 100644
--- a/BTCPayServer/Controllers/GreenField/LocalBTCPayServerClient.cs
+++ b/BTCPayServer/Controllers/GreenField/LocalBTCPayServerClient.cs
@@ -158,11 +158,16 @@ namespace BTCPayServer.Controllers.Greenfield
                 _greenfieldPullPaymentController,
                 _homeController,
                 _storePaymentMethodsController,
-                new HttpContextAccessor() { HttpContext = context }
+                new LocalHttpContextAccessor() { HttpContext = context }
             );
         }
     }
 
+    public class LocalHttpContextAccessor: IHttpContextAccessor
+    {
+        public HttpContext? HttpContext { get; set; }
+    } 
+
     public class LocalBTCPayServerClient : BTCPayServerClient
     {
         private readonly GreenfieldStoreOnChainPaymentMethodsController _chainPaymentMethodsController;