diff --git a/BTCPayServer.Tests/docker-compose.yml b/BTCPayServer.Tests/docker-compose.yml
index 558aa6f1f..ec45c6cff 100644
--- a/BTCPayServer.Tests/docker-compose.yml
+++ b/BTCPayServer.Tests/docker-compose.yml
@@ -84,7 +84,7 @@ services:
       - "bitcoin_datadir:/data"
 
   lightning-charged:
-    image: shesek/lightning-charge:0.3.4
+    image: shesek/lightning-charge:0.3.5
     environment:
       NETWORK: regtest
       API_TOKEN: foiewnccewuify
diff --git a/BTCPayServer/Controllers/InvoiceController.UI.cs b/BTCPayServer/Controllers/InvoiceController.UI.cs
index f6e04d78c..9d7c620a2 100644
--- a/BTCPayServer/Controllers/InvoiceController.UI.cs
+++ b/BTCPayServer/Controllers/InvoiceController.UI.cs
@@ -77,7 +77,7 @@ namespace BTCPayServer.Controllers
                 var onchainMethod = data.GetPaymentMethodDetails() as Payments.Bitcoin.BitcoinLikeOnChainPaymentMethod;
                 if(onchainMethod != null)
                 { 
-                    cryptoPayment.Address = onchainMethod.DepositAddress.ToString();
+                    cryptoPayment.Address = onchainMethod.DepositAddress;
                 }
                 cryptoPayment.Rate = FormatCurrency(data);
                 cryptoPayment.PaymentUrl = cryptoInfo.PaymentUrls.BIP21;
diff --git a/BTCPayServer/Services/Invoices/InvoiceEntity.cs b/BTCPayServer/Services/Invoices/InvoiceEntity.cs
index 92d964675..d1eedaf5a 100644
--- a/BTCPayServer/Services/Invoices/InvoiceEntity.cs
+++ b/BTCPayServer/Services/Invoices/InvoiceEntity.cs
@@ -615,7 +615,7 @@ namespace BTCPayServer.Services.Invoices
             {
                 TxFee = bitcoinPaymentMethod.TxFee;
                 FeeRate = bitcoinPaymentMethod.FeeRate;
-                DepositAddress = bitcoinPaymentMethod.DepositAddress.ToString();
+                DepositAddress = bitcoinPaymentMethod.DepositAddress;
             }
             var jobj = JObject.Parse(JsonConvert.SerializeObject(paymentMethod));
             PaymentMethodDetails = jobj;