diff --git a/BTCPayServer.Tests/TestAccount.cs b/BTCPayServer.Tests/TestAccount.cs
index c6f8586e9..e5f220c26 100644
--- a/BTCPayServer.Tests/TestAccount.cs
+++ b/BTCPayServer.Tests/TestAccount.cs
@@ -154,9 +154,8 @@ namespace BTCPayServer.Tests
             GenerateWalletResponseV = await parent.ExplorerClient.GenerateWalletAsync(new GenerateWalletRequest()
             {
                 ScriptPubKeyType = segwit ? ScriptPubKeyType.Segwit : ScriptPubKeyType.Legacy,
-                SavePrivateKeys = importKeysToNBX
+                SavePrivateKeys = importKeysToNBX,
             });
-
             await store.AddDerivationScheme(StoreId,
                 new DerivationSchemeViewModel()
                 {
diff --git a/BTCPayServer.Tests/UnitTest1.cs b/BTCPayServer.Tests/UnitTest1.cs
index 8e00bb279..d9c238692 100644
--- a/BTCPayServer.Tests/UnitTest1.cs
+++ b/BTCPayServer.Tests/UnitTest1.cs
@@ -2431,7 +2431,6 @@ noninventoryitem:
                         ItemDesc = "Some \", description",
                         FullNotifications = true
                     }, Facade.Merchant);
-
                     var networkFee = Money.Satoshis(10000).ToDecimal(MoneyUnit.BTC);
                     var missingMoney = Money.Satoshis(5000).ToDecimal(MoneyUnit.BTC);
                     var cashCow = tester.ExplorerNode;
diff --git a/BTCPayServer/Events/WalletChangedEvent.cs b/BTCPayServer/Events/WalletChangedEvent.cs
index 94bf1c7cb..bfa6d668b 100644
--- a/BTCPayServer/Events/WalletChangedEvent.cs
+++ b/BTCPayServer/Events/WalletChangedEvent.cs
@@ -1,7 +1,13 @@
+using System;
+
 namespace BTCPayServer.Events
 {
     public class WalletChangedEvent
     {
         public WalletId WalletId { get; set; }
+        public override string ToString()
+        {
+            return  String.Empty;
+        }
     }
 }
diff --git a/BTCPayServer/Services/Wallets/BTCPayWallet.cs b/BTCPayServer/Services/Wallets/BTCPayWallet.cs
index b6d4f15a9..d50de425b 100644
--- a/BTCPayServer/Services/Wallets/BTCPayWallet.cs
+++ b/BTCPayServer/Services/Wallets/BTCPayWallet.cs
@@ -93,7 +93,10 @@ namespace BTCPayServer.Services.Wallets
 
         public async Task TrackAsync(DerivationStrategyBase derivationStrategy)
         {
-            await _Client.TrackAsync(derivationStrategy);
+            await _Client.TrackAsync(derivationStrategy, new TrackWalletRequest()
+            {
+                Wait = false
+            });
         }
 
         public async Task<TransactionResult> GetTransactionAsync(uint256 txId, bool includeOffchain = false, CancellationToken cancellation = default(CancellationToken))