diff --git a/internal/loader/loader.go b/internal/loader/loader.go
index 24c5a78a4..b51139765 100644
--- a/internal/loader/loader.go
+++ b/internal/loader/loader.go
@@ -261,6 +261,7 @@ func (l *Loader) CreateNewWallet(ctx context.Context, pubPassphrase, privPassphr
 		WatchLast:               l.watchLast,
 		AccountGapLimit:         l.accountGapLimit,
 		DisableCoinTypeUpgrades: l.disableCoinTypeUpgrades,
+		DisableMixing:           l.disableMixing,
 		ManualTickets:           l.manualTickets,
 		AllowHighFees:           l.allowHighFees,
 		RelayFee:                l.relayFee,
@@ -318,6 +319,7 @@ func (l *Loader) OpenExistingWallet(ctx context.Context, pubPassphrase []byte) (
 		WatchLast:               l.watchLast,
 		AccountGapLimit:         l.accountGapLimit,
 		DisableCoinTypeUpgrades: l.disableCoinTypeUpgrades,
+		DisableMixing:           l.disableMixing,
 		ManualTickets:           l.manualTickets,
 		AllowHighFees:           l.allowHighFees,
 		RelayFee:                l.relayFee,
diff --git a/wallet/chainntfns.go b/wallet/chainntfns.go
index f41a670f5..ecfd5aef2 100644
--- a/wallet/chainntfns.go
+++ b/wallet/chainntfns.go
@@ -276,7 +276,9 @@ func (w *Wallet) ChainSwitch(ctx context.Context, forest *SidechainForest, chain
 	forest.PruneChain(chain)
 	forest.Prune(int32(chain[len(chain)-1].Header.Height), w.chainParams)
 
-	w.mixClient.ExpireMessages(chain[len(chain)-1].Header.Height)
+	if w.mixing {
+		w.mixClient.ExpireMessages(chain[len(chain)-1].Header.Height)
+	}
 
 	w.NtfnServer.notifyMainChainTipChanged(chainTipChanges)
 	w.NtfnServer.sendAttachedBlockNotification(ctx)