diff --git a/src/main/java/net/knarcraft/minigames/arena/AbstractPlayerEntryState.java b/src/main/java/net/knarcraft/minigames/arena/AbstractPlayerEntryState.java
index 27e6ec9..bfbce94 100644
--- a/src/main/java/net/knarcraft/minigames/arena/AbstractPlayerEntryState.java
+++ b/src/main/java/net/knarcraft/minigames/arena/AbstractPlayerEntryState.java
@@ -88,9 +88,9 @@ public abstract class AbstractPlayerEntryState implements PlayerEntryState {
 
     @Override
     public void restore(@NotNull Player player) {
-        player.setFlying(this.originalIsFlying);
-        player.setGameMode(this.originalGameMode);
         player.setAllowFlight(this.originalAllowFlight);
+        player.setFlying(player.getAllowFlight() && this.originalIsFlying);
+        player.setGameMode(this.originalGameMode);
         player.setInvulnerable(this.originalInvulnerable);
         player.setSwimming(this.originalIsSwimming);
         removeMenuItem(player);