diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c
index 9ac99465ca..7b17f53666 100644
--- a/src/field_screen_effect.c
+++ b/src/field_screen_effect.c
@@ -528,6 +528,7 @@ void DoDiveWarp(void)
     TryFadeOutOldMapMusic();
     WarpFadeOutScreen();
     PlayRainStoppingSoundEffect();
+    SetFollowerNPCData(FNPC_DATA_COME_OUT_DOOR, FNPC_DOOR_NONE);
     gFieldCallback = FieldCB_DefaultWarpExit;
     CreateTask(Task_WarpAndLoadMap, 10);
 }