diff --git a/src/main/java/com/alttd/hunger_games/services/PlayerService.java b/src/main/java/com/alttd/hunger_games/services/PlayerService.java
index 3fd5676..31b1059 100644
--- a/src/main/java/com/alttd/hunger_games/services/PlayerService.java
+++ b/src/main/java/com/alttd/hunger_games/services/PlayerService.java
@@ -131,7 +131,12 @@ public class PlayerService implements RoundListener {
         if (optionalPlayerState.isPresent()) {
             PLAYER_STATE playerState = optionalPlayerState.get();
             return Optional.of(switch (playerState) {
-                case DISCONNECTED, SPECTATING -> PLAYER_STATE.SPECTATING;
+                case DISCONNECTED, SPECTATING -> {
+                    if (roundState.equals(ROUND_STATE.ENDED)) {
+                        yield PLAYER_STATE.REGISTERED;
+                    }
+                    yield PLAYER_STATE.SPECTATING;
+                }
                 case REGISTERED -> PLAYER_STATE.REGISTERED;
             });
         }