diff --git a/BTCPayServer/HostedServices/MigratorHostedService.cs b/BTCPayServer/HostedServices/MigratorHostedService.cs
index 721dad98e..c509bd8de 100644
--- a/BTCPayServer/HostedServices/MigratorHostedService.cs
+++ b/BTCPayServer/HostedServices/MigratorHostedService.cs
@@ -98,7 +98,7 @@ namespace BTCPayServer.HostedServices
                         continue;
                     foreach (var scheme in store.GetSupportedPaymentMethods(_NetworkProvider).OfType<DerivationSchemeSettings>())
                     {
-                        if (blob.WalletKeyPathRoots.TryGetValue(scheme.PaymentId.ToString(), out var root))
+                        if (blob.WalletKeyPathRoots.TryGetValue(scheme.PaymentId.ToString().ToLowerInvariant(), out var root))
                         {
                             scheme.AccountKeyPath = new NBitcoin.KeyPath(root);
                             store.SetSupportedPaymentMethod(scheme);
diff --git a/BTCPayServer/Services/Invoices/InvoiceEntity.cs b/BTCPayServer/Services/Invoices/InvoiceEntity.cs
index c202b8548..cb70d6581 100644
--- a/BTCPayServer/Services/Invoices/InvoiceEntity.cs
+++ b/BTCPayServer/Services/Invoices/InvoiceEntity.cs
@@ -238,8 +238,8 @@ namespace BTCPayServer.Services.Invoices
             {
                 obj.Add(strat.PaymentId.ToString(), PaymentMethodExtensions.Serialize(strat));
 #pragma warning disable CS0618
-                if (strat.PaymentId.IsBTCOnChain)
-                    DerivationStrategy = ((JValue)PaymentMethodExtensions.Serialize(strat)).Value<string>();
+                // This field should eventually disappear
+                DerivationStrategy = null;
             }
             DerivationStrategies = JsonConvert.SerializeObject(obj);
 #pragma warning restore CS0618