diff --git a/server/lobby.go b/server/lobby.go
index dc59113..ba59387 100644
--- a/server/lobby.go
+++ b/server/lobby.go
@@ -6,9 +6,9 @@ import (
 
 type Lobby map[uuid.UUID]Player
 
-var lobbyInstance *Lobby = nil
+var lobbyInstance Lobby = nil
 
-func GetLobby() *Lobby {
+func GetLobby() Lobby {
 	if lobbyInstance == nil {
 		lobbyInstance = newLobby()
 	}
@@ -16,9 +16,9 @@ func GetLobby() *Lobby {
 	return lobbyInstance
 }
 
-func newLobby() *Lobby {
-	var lobby Lobby
-	return &lobby
+func newLobby() Lobby {
+	lobby := make(map[uuid.UUID]Player, 0)
+	return lobby
 }
 
 func (lobby Lobby) RegisterPlayer(player *Player) {