# return early on exact item_id match
if compare_item_ids(base_item, compare_item):
return True
+ # return early on MBID match to avoid issues with ISRC
+ # (https://github.com/music-assistant/hass-music-assistant/issues/2316)
+ if base_item.mbid and compare_item.mbid:
+ return base_item.mbid == compare_item.mbid
# return early on (un)matched external id
external_id_match = compare_external_ids(base_item.external_ids, compare_item.external_ids)
if external_id_match is not None: