diff --git a/plugins/fetchinvoice.c b/plugins/fetchinvoice.c
index f0bf310ff..fa15ec703 100644
--- a/plugins/fetchinvoice.c
+++ b/plugins/fetchinvoice.c
@@ -220,6 +220,29 @@ static struct command_result *handle_invreq_response(struct command *cmd,
 		goto badinv;
 	}
 
+	/* BOLT-offers #12:
+	 * A reader of an invoice:
+	 *   - MUST reject the invoice if `invoice_amount` is not present.
+	 *   - MUST reject the invoice if `invoice_created_at` is not present.
+	 *   - MUST reject the invoice if `invoice_payment_hash` is not present.
+	 *   - MUST reject the invoice if `invoice_node_id` is not present.
+	 */
+	if (!inv->invoice_amount) {
+		badfield = "invoice_amount";
+		goto badinv;
+	}
+	if (!inv->invoice_created_at) {
+		badfield = "invoice_amount";
+		goto badinv;
+	}
+	if (!inv->invoice_payment_hash) {
+		badfield = "invoice_payment_hash";
+		goto badinv;
+	}
+	if (!inv->invoice_node_id) {
+		badfield = "invoice_node_id";
+		goto badinv;
+	}
 	/* BOLT-offers #12:
 	 * - if `offer_issuer_id` is present (invoice_request for an offer):
 	 *   - MUST reject the invoice if `invoice_node_id` is not equal to `offer_issuer_id`
@@ -227,7 +250,8 @@ static struct command_result *handle_invreq_response(struct command *cmd,
 	 *   - MUST reject the invoice if `invoice_node_id` is not equal to the final
 	 *    `blinded_node_id` it sent the `invoice_request` to.
 	 */
-	if (!inv->invoice_node_id || !pubkey_eq(inv->offer_issuer_id, sent->issuer_key)) {
+	/* Either way, we save the expected id in issuer_key */
+	if (!pubkey_eq(inv->invoice_node_id, sent->issuer_key)) {
 		badfield = "invoice_node_id";
 		goto badinv;
 	}
@@ -245,15 +269,6 @@ static struct command_result *handle_invreq_response(struct command *cmd,
 		goto badinv;
 	}
 
-	/* BOLT-offers #12:
-	 * A reader of an invoice:
-	 *   - MUST reject the invoice if `invoice_amount` is not present.
-	 */
-	if (!inv->invoice_amount) {
-		badfield = "invoice_amount";
-		goto badinv;
-	}
-
 	/* Get the amount we expected: firstly, if that's what we sent,
 	 * secondly, if specified in the invoice. */
 	if (inv->invreq_amount) {