diff --git a/src/game/mario.c b/src/game/mario.c
index 057c2622..d714ea9c 100644
--- a/src/game/mario.c
+++ b/src/game/mario.c
@@ -1543,7 +1543,6 @@ void update_mario_inputs(struct MarioState *m) {
     debug_print_speed_action_normal(m);
 
     if (Cheats.enabled && Cheats.moonJump && m->controller->buttonDown & L_TRIG) {
-        set_mario_action(m, ACT_FREEFALL, 0);
         m->faceAngle[1] = m->intendedYaw - approach_s32((s16)(m->intendedYaw - m->faceAngle[1]), 0, 0x800, 0x800);
         m->vel[1] = 30;
     }
diff --git a/src/game/mario_actions_airborne.c b/src/game/mario_actions_airborne.c
index 98d61a63..bf1bafc6 100644
--- a/src/game/mario_actions_airborne.c
+++ b/src/game/mario_actions_airborne.c
@@ -53,6 +53,7 @@ void play_knockback_sound(struct MarioState *m) {
 #endif
 
 s32 lava_boost_on_wall(struct MarioState *m) {
+    if (Cheats.enabled && Cheats.godMode) { return; }
     m->faceAngle[1] = atan2s(m->wallNormal[2], m->wallNormal[0]);
 
     if (m->forwardVel < 24.0f) {