diff --git a/src/lara.h b/src/lara.h
index e278b22..5c2982a 100644
--- a/src/lara.h
+++ b/src/lara.h
@@ -687,6 +687,13 @@ struct Lara : Character {
 
         if (itemHolster != TR::Entity::NONE)
             meshSwap(1, level->extra.weapons[itemHolster], JOINT_MASK_LEG_L1 | JOINT_MASK_LEG_R1);
+
+        if (getRoom().flags.water) {
+            stand = STAND_UNDERWATER;
+            if (state == STATE_SURF_TREAD || state == STATE_SURF_SWIM || state == STATE_SURF_BACK || state == STATE_SURF_LEFT || state == STATE_SURF_RIGHT)
+                stand = STAND_ONWATER;
+        } else
+            stand = STAND_AIR;
     }
 
     int getRoomByPos(const vec3 &pos) {