diff --git a/Server/src/main/java/uulm/teamname/marvelous/server/lobbymanager/LobbyManager.java b/Server/src/main/java/uulm/teamname/marvelous/server/lobbymanager/LobbyManager.java
index c477231..8799482 100644
--- a/Server/src/main/java/uulm/teamname/marvelous/server/lobbymanager/LobbyManager.java
+++ b/Server/src/main/java/uulm/teamname/marvelous/server/lobbymanager/LobbyManager.java
@@ -101,7 +101,13 @@ public class LobbyManager {
             return;
         }
 
-        ParticipantType type = lobby.freeSlot();
+        ParticipantType type;
+
+        if (role == RoleEnum.SPECTATOR) {
+            type = ParticipantType.Spectator;
+        } else {
+            type = lobby.freeSlot();
+        }
 
         Logger.trace("New participant '{}' has the role '{}'", client.id.getName(), type);