diff --git a/WalletWasabi/WabiSabi/Client/CoinJoinManager.cs b/WalletWasabi/WabiSabi/Client/CoinJoinManager.cs
index 90f158863b4..272e4b0367e 100644
--- a/WalletWasabi/WabiSabi/Client/CoinJoinManager.cs
+++ b/WalletWasabi/WabiSabi/Client/CoinJoinManager.cs
@@ -514,6 +514,8 @@ private async Task MarkDestinationsUsedAsync(ImmutableList<Script> outputs)
 				{
 					w.KeyManager.SetKeyState(state, hdPubKey);
 				}
+
+				w.KeyManager.ToFile();
 			}
 			else
 			{
diff --git a/WalletWasabi/WabiSabi/Client/KeyChain.cs b/WalletWasabi/WabiSabi/Client/KeyChain.cs
index 1c9c87a69ef..0b8d63040a3 100644
--- a/WalletWasabi/WabiSabi/Client/KeyChain.cs
+++ b/WalletWasabi/WabiSabi/Client/KeyChain.cs
@@ -35,6 +35,8 @@ public void TrySetScriptStates(KeyState state, IEnumerable<Script> scripts)
 		{
 			KeyManager.SetKeyState(state, hdPubKey);
 		}
+
+		KeyManager.ToFile();
 	}
 
 	public OwnershipProof GetOwnershipProof(IDestination destination, CoinJoinInputCommitmentData commitmentData)