1 files changed, 7 insertions, 8 deletions
diff --git a/core/runtime.rs b/core/runtime.rs
index 2e417bb9d..f735f5575 100644
--- a/core/runtime.rs
+++ b/core/runtime.rs
@@ -1127,12 +1127,7 @@ impl JsRuntime {
     self.pump_v8_message_loop()?;
 
     // Ops
-    {
-      self.resolve_async_ops(cx)?;
-      self.drain_nexttick()?;
-      self.drain_macrotasks()?;
-      self.check_promise_exceptions()?;
-    }
+    self.resolve_async_ops(cx)?;
     // Dynamic module loading - ie. modules loaded using "import()"
     {
       // Run in a loop so that dynamic imports that only depend on another
@@ -1157,9 +1152,13 @@ impl JsRuntime {
           break;
         }
       }
-
-      self.check_promise_exceptions()?;
     }
+    // Run all next tick callbacks and macrotasks callbacks and only then
+    // check for any promise exceptions (`unhandledrejection` handlers are
+    // run in macrotasks callbacks so we need to let them run first).
+    self.drain_nexttick()?;
+    self.drain_macrotasks()?;
+    self.check_promise_exceptions()?;
 
     // Event loop middlewares
     let mut maybe_scheduling = false;