diff --git a/crates/cdk/src/nuts/nut13.rs b/crates/cdk/src/nuts/nut13.rs
index 763fe05f..93814dce 100644
--- a/crates/cdk/src/nuts/nut13.rs
+++ b/crates/cdk/src/nuts/nut13.rs
@@ -46,7 +46,6 @@ impl PreMintSecrets {
         counter: u32,
         xpriv: ExtendedPrivKey,
         amount: Amount,
-        zero_amount: bool,
         amount_split_target: &SplitTarget,
     ) -> Result<Self, Error> {
         let mut pre_mint_secrets = PreMintSecrets::default();
@@ -59,7 +58,43 @@ impl PreMintSecrets {
 
             let (blinded, r) = blind_message(&secret.to_bytes(), Some(blinding_factor))?;
 
-            let amount = if zero_amount { Amount::ZERO } else { amount };
+            let blinded_message = BlindedMessage::new(amount, keyset_id, blinded);
+
+            let pre_mint = PreMint {
+                blinded_message,
+                secret: secret.clone(),
+                r,
+                amount,
+            };
+
+            pre_mint_secrets.secrets.push(pre_mint);
+            counter += 1;
+        }
+
+        Ok(pre_mint_secrets)
+    }
+
+    pub fn from_xpriv_blank(
+        keyset_id: Id,
+        counter: u32,
+        xpriv: ExtendedPrivKey,
+        amount: Amount,
+    ) -> Result<Self, Error> {
+        if amount <= Amount::ZERO {
+            return Ok(PreMintSecrets::default());
+        }
+        let count = ((u64::from(amount) as f64).log2().ceil() as u64).max(1);
+        let mut pre_mint_secrets = PreMintSecrets::default();
+
+        let mut counter = counter;
+
+        for _ in 0..count {
+            let secret = Secret::from_xpriv(xpriv, keyset_id, counter)?;
+            let blinding_factor = SecretKey::from_xpriv(xpriv, keyset_id, counter)?;
+
+            let (blinded, r) = blind_message(&secret.to_bytes(), Some(blinding_factor))?;
+
+            let amount = Amount::ZERO;
 
             let blinded_message = BlindedMessage::new(amount, keyset_id, blinded);
 
diff --git a/crates/cdk/src/wallet/mod.rs b/crates/cdk/src/wallet/mod.rs
index 6c7e1787..5e72aead 100644
--- a/crates/cdk/src/wallet/mod.rs
+++ b/crates/cdk/src/wallet/mod.rs
@@ -599,7 +599,6 @@ impl Wallet {
                 count,
                 self.xpriv,
                 quote_info.amount,
-                false,
                 &amount_split_target,
             )?,
         };
@@ -811,7 +810,6 @@ impl Wallet {
                     count,
                     self.xpriv,
                     change_amount,
-                    false,
                     amount_split_target,
                 )?;
 
@@ -838,7 +836,6 @@ impl Wallet {
                     count,
                     self.xpriv,
                     desired_amount,
-                    false,
                     amount_split_target,
                 )?;
 
@@ -849,7 +846,6 @@ impl Wallet {
                     count,
                     self.xpriv,
                     change_amount,
-                    false,
                     amount_split_target,
                 )?;
 
@@ -1039,17 +1035,37 @@ impl Wallet {
             return Err(Error::QuoteUnknown);
         };
 
+        let inputs_needed_amount = quote_info.amount + quote_info.fee_reserve;
+
         let proofs = self
             .select_proofs(
                 mint_url.clone(),
                 quote_info.unit.clone(),
-                quote_info.amount,
+                inputs_needed_amount,
                 None,
             )
             .await?
             .1;
 
-        let proofs_amount = proofs.iter().map(|p| p.amount).sum();
+        let proofs_amount = proofs.iter().map(|p| p.amount).sum::<Amount>();
+
+        let input_proofs = match proofs_amount > inputs_needed_amount {
+            true => {
+                let proofs = self
+                    .swap(
+                        mint_url,
+                        &quote_info.unit,
+                        Some(inputs_needed_amount),
+                        &amount_split_target,
+                        proofs,
+                        None,
+                    )
+                    .await?;
+
+                proofs.ok_or(Error::InsufficientFunds)?
+            }
+            false => proofs,
+        };
 
         let active_keyset_id = self.active_mint_keyset(mint_url, &quote_info.unit).await?;
 
@@ -1060,13 +1076,11 @@ impl Wallet {
 
         let count = count.map_or(0, |c| c + 1);
 
-        let premint_secrets = PreMintSecrets::from_xpriv(
+        let premint_secrets = PreMintSecrets::from_xpriv_blank(
             active_keyset_id,
             count,
             self.xpriv,
-            proofs_amount,
-            true,
-            &amount_split_target,
+            quote_info.fee_reserve,
         )?;
 
         let melt_response = self
@@ -1074,7 +1088,7 @@ impl Wallet {
             .post_melt(
                 mint_url.clone().try_into()?,
                 quote_id.to_string(),
-                proofs.clone(),
+                input_proofs.clone(),
                 Some(premint_secrets.blinded_messages()),
             )
             .await?;
@@ -1126,7 +1140,7 @@ impl Wallet {
 
         self.localstore.remove_melt_quote(&quote_info.id).await?;
 
-        self.localstore.remove_proofs(&proofs).await?;
+        self.localstore.remove_proofs(&input_proofs).await?;
 
         Ok(melted)
     }