Prevent subscribers unnecessarily entering failure state

I'd prefer not to hardcode the pk, but can't see a better solution with the existing message sets.