diff --git a/lightning/src/offers/invoice_request.rs b/lightning/src/offers/invoice_request.rs
index 4311d194dca..71df6a0d216 100644
--- a/lightning/src/offers/invoice_request.rs
+++ b/lightning/src/offers/invoice_request.rs
@@ -2040,6 +2040,32 @@ mod tests {
 			Err(e) => assert_eq!(e, Bolt12SemanticError::MissingAmount),
 		}
 
+		// An offer with amount_msats(0) is normalized to None, so invoice request must provide amount.
+		match OfferBuilder::new(recipient_pubkey())
+			.amount_msats(0)
+			.build()
+			.unwrap()
+			.request_invoice(&expanded_key, nonce, &secp_ctx, payment_id)
+			.unwrap()
+			.build_and_sign()
+		{
+			Ok(_) => panic!("expected error"),
+			Err(e) => assert_eq!(e, Bolt12SemanticError::MissingAmount),
+		}
+
+		// But providing an amount in the invoice request should succeed.
+		let invoice_request = OfferBuilder::new(recipient_pubkey())
+			.amount_msats(0)
+			.build()
+			.unwrap()
+			.request_invoice(&expanded_key, nonce, &secp_ctx, payment_id)
+			.unwrap()
+			.amount_msats(1000)
+			.unwrap()
+			.build_and_sign()
+			.unwrap();
+		assert_eq!(invoice_request.amount_msats(), Some(1000));
+
 		match OfferBuilder::new(recipient_pubkey())
 			.amount_msats(1000)
 			.supported_quantity(Quantity::Unbounded)
diff --git a/lightning/src/offers/offer.rs b/lightning/src/offers/offer.rs
index 7ad3c282c77..74cc5589e81 100644
--- a/lightning/src/offers/offer.rs
+++ b/lightning/src/offers/offer.rs
@@ -405,6 +405,10 @@ macro_rules! offer_builder_methods { (
 				if amount_msats > MAX_VALUE_MSAT {
 					return Err(Bolt12SemanticError::InvalidAmount);
 				}
+				// An amount of 0 is equivalent to not setting an amount, so default to None.
+				if amount_msats == 0 {
+					$self.offer.amount = None;
+				}
 			},
 			Some(Amount::Currency { .. }) => return Err(Bolt12SemanticError::UnsupportedCurrency),
 			None => {},
@@ -1309,8 +1313,12 @@ impl TryFrom<FullOfferTlvStream> for OfferContents {
 			(None, Some(amount_msats)) if amount_msats > MAX_VALUE_MSAT => {
 				return Err(Bolt12SemanticError::InvalidAmount);
 			},
+			// An amount of 0 is equivalent to not setting an amount, so default to None.
+			(None, Some(0)) => None,
 			(None, Some(amount_msats)) => Some(Amount::Bitcoin { amount_msats }),
 			(Some(_), None) => return Err(Bolt12SemanticError::MissingAmount),
+			// An amount of 0 with a currency is equivalent to not setting an amount.
+			(Some(_), Some(0)) => None,
 			(Some(currency_bytes), Some(amount)) => {
 				let iso4217_code = CurrencyCode::new(currency_bytes)
 					.map_err(|_| Bolt12SemanticError::InvalidCurrencyCode)?;
@@ -1702,6 +1710,21 @@ mod tests {
 			Ok(_) => panic!("expected error"),
 			Err(e) => assert_eq!(e, Bolt12SemanticError::InvalidAmount),
 		}
+
+		// An amount of 0 is equivalent to not setting an amount and should default to None.
+		let offer = OfferBuilder::new(pubkey(42)).amount_msats(0).build().unwrap();
+		assert_eq!(offer.amount(), None);
+		assert_eq!(offer.as_tlv_stream().0.amount, None);
+
+		// Verify roundtrip: offer with amount=0 serializes and parses back with amount=None.
+		let serialized = offer.to_string();
+		match serialized.parse::<Offer>() {
+			Ok(reparsed) => {
+				assert_eq!(reparsed.amount(), None);
+				assert_eq!(reparsed.as_tlv_stream().0.amount, None);
+			},
+			Err(e) => panic!("error parsing offer: {:?}", e),
+		}
 	}
 
 	#[test]
@@ -1974,6 +1997,36 @@ mod tests {
 				Bolt12ParseError::InvalidSemantics(Bolt12SemanticError::InvalidCurrencyCode)
 			),
 		}
+
+		// An amount of 0 is equivalent to not setting an amount and should default to None.
+		let mut tlv_stream = offer.as_tlv_stream();
+		tlv_stream.0.amount = Some(0);
+		tlv_stream.0.currency = None;
+
+		let mut encoded_offer = Vec::new();
+		tlv_stream.write(&mut encoded_offer).unwrap();
+
+		match Offer::try_from(encoded_offer) {
+			Ok(offer) => {
+				assert_eq!(offer.amount(), None);
+			},
+			Err(e) => panic!("error parsing offer: {:?}", e),
+		}
+
+		// An amount of 0 with a currency is also equivalent to not setting an amount.
+		let mut tlv_stream = offer.as_tlv_stream();
+		tlv_stream.0.amount = Some(0);
+		tlv_stream.0.currency = Some(b"USD");
+
+		let mut encoded_offer = Vec::new();
+		tlv_stream.write(&mut encoded_offer).unwrap();
+
+		match Offer::try_from(encoded_offer) {
+			Ok(offer) => {
+				assert_eq!(offer.amount(), None);
+			},
+			Err(e) => panic!("error parsing offer: {:?}", e),
+		}
 	}
 
 	#[test]