diff --git a/daemon/codec.c b/daemon/codec.c
index 23886bb5d..3d1c5a129 100644
--- a/daemon/codec.c
+++ b/daemon/codec.c
@@ -5203,6 +5203,8 @@ void __codec_store_populate(struct codec_store *dst, struct codec_store *src, st
 		rtp_payload_type *pt = l->data;
 		rtp_payload_type *orig_pt = t_hash_table_lookup(orig_dst.codecs,
 				GINT_TO_POINTER(pt->payload_type));
+		if (orig_pt && !rtp_payload_type_eq_compat(orig_pt, pt))
+			orig_pt = NULL;
 		if (a.answer_only && !orig_pt) {
 			if (a.allow_asymmetric)
 				orig_pt = codec_store_find_compatible(&orig_dst, pt);