diff --git a/src/core/timing_event.cpp b/src/core/timing_event.cpp
index 39aba3f2a..22ba078c0 100644
--- a/src/core/timing_event.cpp
+++ b/src/core/timing_event.cpp
@@ -135,7 +135,8 @@ void TimingEvents::SortEvent(TimingEvent* event)
       event->prev = nullptr;
       event->next = s_state.active_events_head;
       s_state.active_events_head = event;
-      UpdateCPUDowncount();
+      if (!s_state.current_event)
+        UpdateCPUDowncount();
     }
   }
   else if (event->next && event_runtime > event->next->m_next_run_time)
@@ -576,6 +577,8 @@ void TimingEvent::Schedule(TickCount ticks)
 {
   using namespace TimingEvents;
 
+  DebugAssert(ticks > 0);
+
   const GlobalTicks ts = GetTimestampForNewEvent();
   const GlobalTicks next_run_time = ts + static_cast<u32>(ticks);