diff --git a/src/fp.c b/src/fp.c
index 2c706584..76835476 100644
--- a/src/fp.c
+++ b/src/fp.c
@@ -321,7 +321,9 @@ void fpUpdateCheats(void) {
         }
     }
     if (CHEAT_ACTIVE(CHEAT_AUTO_ACTION_CMD)) {
-        pm_gActionCommandStatus.autoSucceed = 1;
+        // prevent tidal wave crash
+        pm_gActionCommandStatus.autoSucceed =
+            pm_gActionCommandStatus.actionCommandID != 23 || pm_gActionCommandStatus.unk_5D < 14;
     }
     if (CHEAT_ACTIVE(CHEAT_BRIGHTEN_ROOM)) {
         pm_set_screen_overlay_alpha(1, 0);