diff --git a/src/components/create-or-join/CreateOrJoin.jsx b/src/components/create-or-join/CreateOrJoin.jsx
index cdc6b03..d8d3fa6 100644
--- a/src/components/create-or-join/CreateOrJoin.jsx
+++ b/src/components/create-or-join/CreateOrJoin.jsx
@@ -29,9 +29,11 @@ class CreateOrJoin extends React.Component {
               <Button size='large' className='shadow' onClick={this.props.showNewGame}>
                 New Game
               </Button>
-              <Button size='large' className='shadow' onClick={this.props.showJoinGame}>
-                Join Game
-              </Button>
+              {this.props.start.start.games.length > 0 ? (
+                  <Button size='large' className='shadow' onClick={this.props.showJoinGame}>
+                    Join Game
+                  </Button>
+              ) : (<Fragment />)}
             </Fragment>
         );
     }