diff --git a/src/core/core_manager.cpp b/src/core/core_manager.cpp
index a7284c4336..a544ee8fce 100644
--- a/src/core/core_manager.cpp
+++ b/src/core/core_manager.cpp
@@ -28,6 +28,8 @@ CoreManager::CoreManager(System& system, std::size_t core_index)
 CoreManager::~CoreManager() = default;
 
 void CoreManager::RunLoop(bool tight_loop) {
+    Reschedule();
+
     // If we don't have a currently active thread then don't execute instructions,
     // instead advance to the next event and try to yield to the next thread
     if (Kernel::GetCurrentThread() == nullptr) {
@@ -41,7 +43,6 @@ void CoreManager::RunLoop(bool tight_loop) {
         }
     }
 
-    Reschedule();
     core_timing.Advance();
 }