diff --git a/src/game/mario_actions_cutscene.c b/src/game/mario_actions_cutscene.c
index 0e8afac2..a1d27d22 100644
--- a/src/game/mario_actions_cutscene.c
+++ b/src/game/mario_actions_cutscene.c
@@ -704,6 +704,10 @@ void general_star_dance_handler(struct MarioState *m, s32 isInWater) {
         } else {
             set_mario_action(m, isInWater ? ACT_WATER_IDLE : ACT_IDLE, 0);
         }
+        if (gServerSettings.stayInLevelAfterStar) {
+            set_camera_mode(m->area->camera, m->area->camera->defMode, 1);
+            m->area->camera->cutscene = 0;
+        }
     }
 }