diff --git a/crates/cdk/src/mint/melt.rs b/crates/cdk/src/mint/melt.rs
index d0792ca0..e50a2396 100644
--- a/crates/cdk/src/mint/melt.rs
+++ b/crates/cdk/src/mint/melt.rs
@@ -755,13 +755,6 @@ impl Mint {
         )
         .await?;
 
-        self.pubsub_manager.melt_quote_status(
-            &quote,
-            payment_preimage.clone(),
-            None,
-            MeltQuoteState::Paid,
-        );
-
         let mut change = None;
 
         // Check if there is change to return
@@ -827,6 +820,13 @@ impl Mint {
             }
         }
 
+        self.pubsub_manager.melt_quote_status(
+            &quote,
+            payment_preimage.clone(),
+            change.clone(),
+            MeltQuoteState::Paid,
+        );
+
         proof_writer.commit();
         tx.commit().await?;