diff --git a/skins/base/views/organisms/RoomView.js b/skins/base/views/organisms/RoomView.js
index b6bfedf19..7a22b0178 100644
--- a/skins/base/views/organisms/RoomView.js
+++ b/skins/base/views/organisms/RoomView.js
@@ -83,9 +83,17 @@ module.exports = React.createClass({
 
     render: function() {
         if (!this.state.room) {
-            return (
-                <div />
-            );
+            if (this.props.roomId) {
+                return (
+                    <div>
+                    <button onClick={this.onJoinButtonClicked}>Join Room</button>
+                    </div>
+                );
+            } else {
+                return (
+                    <div />
+                );
+            }
         }
 
         var myUserId = MatrixClientPeg.get().credentials.userId;