Possible fix.

Youri van Koppenrequested to merge
issue/feeds-3487439:3487439-state-restore-messenger into 8.x-3.x

Closes #3487439

Merge request reports