diff --git a/swappy-bot/Commands/Swap/Swap.cs b/swappy-bot/Commands/Swap/Swap.cs
index a8a7671..da7990b 100644
--- a/swappy-bot/Commands/Swap/Swap.cs
+++ b/swappy-bot/Commands/Swap/Swap.cs
@@ -504,8 +504,6 @@ await Context.Channel.SendMessageAsync(
                 // var quotePlatformFee = 0.01;
                 // var quoteChainflipFee = 5.49;
 
-                swapState.DestinationAddress = address;
-
                 swapState.QuoteTime = quoteTime;
                 swapState.QuoteDeposit = quoteDeposit;
                 swapState.QuoteReceive = quoteReceive;
@@ -514,6 +512,8 @@ await Context.Channel.SendMessageAsync(
                 // swapState.QuoteChainflipFee = quoteChainflipFee;
             }
 
+            swapState.DestinationAddress = address;
+
             var swapButtons = BuildSwapButtons("swap-step6", stateId);
 
             await Context.Channel.SendMessageAsync(