Fixed edge case introduced in  Streams/chat