diff --git a/src/field_effect.c b/src/field_effect.c
index 734c103ca6..00c456dfe5 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -3972,6 +3972,7 @@ static bool8 RockClimb_Init(struct Task *task, struct ObjectEvent *objectEvent)
     ScriptContext2_Enable();
     FreezeObjectEvents();
     gPlayerAvatar.preventStep = TRUE;
+    SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_SURFING);
     PlayerGetDestCoords(&task->tDestX, &task->tDestY);
     MoveCoords(gObjectEvents[gPlayerAvatar.objectEventId].movementDirection, &task->tDestX, &task->tDestY);
     task->tState++;
@@ -4107,6 +4108,7 @@ static bool8 RockClimb_ContinueRideOrEnd(struct Task *task, struct ObjectEvent *
 
     ScriptContext2_Enable();
     gPlayerAvatar.flags &= ~PLAYER_AVATAR_FLAG_SURFING;
+    gPlayerAvatar.flags &= ~PLAYER_AVATAR_FLAG_5;
     gPlayerAvatar.flags |= PLAYER_AVATAR_FLAG_ON_FOOT;
     task->tState++;
     return FALSE;