Fix https://gitlab.com/gitlab-org/gitter/webapp/issues/1742 Fix https://gitlab.com/gitlab-org/gitter/webapp-temp-issues-for-move/issues/6