diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc
index cd7322e..d06ca9f 100644
--- a/server/gameserver/player.cc
+++ b/server/gameserver/player.cc
@@ -355,7 +355,9 @@ void Player::UpdateUseItemIdx()
 
 void Player::UpdateSpectate()
 {
-    if (a8::HasBitFlag(status, HS_Fly)) {
+    if (room->gas_data.gas_mode == GasInactive ||
+        room->gas_data.gas_mode == GasJump ||
+        a8::HasBitFlag(status, HS_Fly)) {
         spectate = false;
         return;
     }