diff --git a/ebiten-game/game/main.go b/ebiten-game/game/main.go
index adda483f..5648cc3f 100644
--- a/ebiten-game/game/main.go
+++ b/ebiten-game/game/main.go
@@ -410,6 +410,11 @@ func (g *game) startClient() {
 	if err != nil {
 		panic(err)
 	}
+	if response.StatusCode != http.StatusOK {
+		g.writeLog("Failed to join lobby, probably doesn't exist.\n")
+
+		return
+	}
 	var pData playerData
 	err = json.NewDecoder(response.Body).Decode(&pData)
 	if err != nil {
diff --git a/ebiten-game/game/ui.go b/ebiten-game/game/ui.go
index 3dfba330..5b5e34a6 100644
--- a/ebiten-game/game/ui.go
+++ b/ebiten-game/game/ui.go
@@ -56,9 +56,11 @@ func (g *game) logWindow(ctx *debugui.Context) {
 			ctx.Button("Host Game").On(func() {
 				submitOpen()
 			})
-			ctx.Button("Join").On(func() {
-				submitJoin()
-			})
+			if !g.isHost {
+				ctx.Button("Join").On(func() {
+					submitJoin()
+				})
+			}
 		})
 	})
 }