diff --git a/BTCPayServer/Payments/Lightning/Lnd/LndInvoiceClient.cs b/BTCPayServer/Payments/Lightning/Lnd/LndInvoiceClient.cs
index 1142565c5..e182b0240 100644
--- a/BTCPayServer/Payments/Lightning/Lnd/LndInvoiceClient.cs
+++ b/BTCPayServer/Payments/Lightning/Lnd/LndInvoiceClient.cs
@@ -74,13 +74,15 @@ namespace BTCPayServer.Payments.Lightning.Lnd
         // TODO: These two methods where you wait on invoice are still work in progress
         public Task<ILightningListenInvoiceSession> Listen(CancellationToken cancellation = default(CancellationToken))
         {
-            return Task.FromResult<ILightningListenInvoiceSession>(this);
+            throw new NotImplementedException();
+            //return Task.FromResult<ILightningListenInvoiceSession>(this);
         }
 
         async Task<LightningInvoice> ILightningListenInvoiceSession.WaitInvoice(CancellationToken cancellation)
         {
-            var resp = await _rpcClient.SubscribeInvoicesAsync(cancellation);
-            return ConvertLndInvoice(resp);
+            throw new NotImplementedException();
+            //var resp = await _rpcClient.SubscribeInvoicesAsync(cancellation);
+            //return ConvertLndInvoice(resp);
         }
         // Eof work in progress
 
@@ -144,8 +146,4 @@ namespace BTCPayServer.Payments.Lightning.Lnd
             }
         }
     }
-
-    public partial class LndSwaggerClient
-    {
-    }
 }
diff --git a/BTCPayServer/Payments/Lightning/Lnd/LndSwaggerClientCustomHttp.cs b/BTCPayServer/Payments/Lightning/Lnd/LndSwaggerClientCustomHttp.cs
index 8f8187615..8d0d02ca7 100644
--- a/BTCPayServer/Payments/Lightning/Lnd/LndSwaggerClientCustomHttp.cs
+++ b/BTCPayServer/Payments/Lightning/Lnd/LndSwaggerClientCustomHttp.cs
@@ -89,4 +89,8 @@ namespace BTCPayServer.Payments.Lightning.Lnd
             return handler;
         }
     }
+
+    public partial class LndSwaggerClient
+    {
+    }
 }