diff --git a/src/components/stage_select.rs b/src/components/stage_select.rs
index 1d661cb..ed79b9c 100644
--- a/src/components/stage_select.rs
+++ b/src/components/stage_select.rs
@@ -24,7 +24,6 @@ impl StageSelect {
 
     pub fn reset(&mut self) {
         self.stage_select_text_y_pos = 54;
-        self.current_teleport_slot = 0;
         self.tick = 0;
     }
 }
@@ -35,6 +34,10 @@ impl GameEntity<(&Player, &Player)> for StageSelect {
             .filter(|&&(index, _event_num)| index != 0)
             .count();
 
+        if slot_count <= self.current_teleport_slot as usize {
+            self.current_teleport_slot = 0;
+        }
+
         if self.stage_select_text_y_pos > 46 {
             self.stage_select_text_y_pos -= 1;
         }