diff --git a/src/com/garbagemule/MobArena/commands/setup/SetupCommand.java b/src/com/garbagemule/MobArena/commands/setup/SetupCommand.java
index ca8e938..0ab3e7e 100644
--- a/src/com/garbagemule/MobArena/commands/setup/SetupCommand.java
+++ b/src/com/garbagemule/MobArena/commands/setup/SetupCommand.java
@@ -382,10 +382,14 @@ public class SetupCommand implements Command, Listener {
             arena.setEnabled(enabled);
             arena.getRegion().save();
             arena.getRegion().reloadAll();
-            player.setFlying(flying);
-            player.setAllowFlight(allowFlight);
             player.getInventory().setContents(items);
             player.getInventory().setArmorContents(armor);
+
+            // setAllowFlight(false) also handles setFlying(false)
+            player.setAllowFlight(allowFlight);
+            if (allowFlight) {
+                player.setFlying(flying);
+            }
         }