diff --git a/src/components/views/rooms/RoomPreviewBar.js b/src/components/views/rooms/RoomPreviewBar.js
index 189df5e696..cba33a3b0e 100644
--- a/src/components/views/rooms/RoomPreviewBar.js
+++ b/src/components/views/rooms/RoomPreviewBar.js
@@ -127,7 +127,7 @@ module.exports = React.createClass({
             return MessageCase.Joining;
         } else if (this.props.rejecting) {
             return MessageCase.Rejecting;
-        } else if (this.props.loading) {
+        } else if (this.props.loading || this.state.busy) {
             return MessageCase.Loading;
         }