Fix(workaround) for unread counter issues