Fixed an issue where there were  no messages in the last 5