diff --git a/common/read_peer_msg.c b/common/read_peer_msg.c
index 96c61a015..2f8f5a3b5 100644
--- a/common/read_peer_msg.c
+++ b/common/read_peer_msg.c
@@ -85,7 +85,8 @@ u8 *read_peer_msg_(const tal_t *ctx,
 		 *    message:
 		 *    - MUST ignore the message.
 		 */
-		err_pkt(err, &chanid, arg);
+		if (structeq(&chanid, channel) || channel_id_is_all(&chanid))
+			err_pkt(err, &chanid, arg);
 
 		return tal_free(msg);
 	}