diff --git a/src/calendar_manager.py b/src/calendar_manager.py
index 7c3803fa..caea6fac 100644
--- a/src/calendar_manager.py
+++ b/src/calendar_manager.py
@@ -297,9 +297,6 @@ class CalendarManager:
             # Update the display
             self.display_manager.update_display()
             logger.debug("CalendarManager event display updated.")
-            
-            # Advance to next event for next display
-            self.advance_event()
         else:
             # Draw failed (error logged in draw_event), show debug message
             logger.warning("Failed to draw calendar event")
diff --git a/src/display_controller.py b/src/display_controller.py
index 83f20ca2..bb26d712 100644
--- a/src/display_controller.py
+++ b/src/display_controller.py
@@ -347,6 +347,10 @@ class DisplayController:
                 # Only proceed with mode switching if no live games
                 if current_time - self.last_switch > self.get_current_duration():
                     # No live games, continue with regular rotation
+                    # If we're currently on calendar, advance to next event before switching modes
+                    if self.current_display_mode == 'calendar' and self.calendar:
+                        self.calendar.advance_event()
+                    
                     self.current_mode_index = (self.current_mode_index + 1) % len(self.available_modes)
                     self.current_display_mode = self.available_modes[self.current_mode_index]
                     logger.info(f"Switching to: {self.current_display_mode}")