diff --git a/BTCPayServer/Controllers/GreenField/LightningNodeApiController.Internal.cs b/BTCPayServer/Controllers/GreenField/LightningNodeApiController.Internal.cs
index 8d2cb19b3..3f44e5168 100644
--- a/BTCPayServer/Controllers/GreenField/LightningNodeApiController.Internal.cs
+++ b/BTCPayServer/Controllers/GreenField/LightningNodeApiController.Internal.cs
@@ -107,7 +107,7 @@ namespace BTCPayServer.Controllers.GreenField
             var network = _btcPayNetworkProvider.GetNetwork<BTCPayNetwork>(cryptoCode);
             if (network == null || !CanUseInternalLightning(doingAdminThings) || internalLightningNode == null)
             {
-                return null;
+                return Task.FromResult<ILightningClient>(null);
             }
 
             return Task.FromResult(_lightningClientFactory.Create(internalLightningNode, network));
diff --git a/BTCPayServer/Controllers/GreenField/LightningNodeApiController.Store.cs b/BTCPayServer/Controllers/GreenField/LightningNodeApiController.Store.cs
index 765807b4c..b9e84eeec 100644
--- a/BTCPayServer/Controllers/GreenField/LightningNodeApiController.Store.cs
+++ b/BTCPayServer/Controllers/GreenField/LightningNodeApiController.Store.cs
@@ -120,7 +120,7 @@ namespace BTCPayServer.Controllers.GreenField
             if (existing == null || (existing.GetLightningUrl().IsInternalNode(internalLightningNode) &&
                                      !CanUseInternalLightning(doingAdminThings)))
             {
-                return null;
+                return Task.FromResult<ILightningClient>(null);
             }
 
             return Task.FromResult(_lightningClientFactory.Create(existing.GetLightningUrl(), network));