[TIMOB-13491] Worked around messaging bug