CLC-2607 (QA) Fix crash in status feed

QA branch version of #1684