diff --git a/addon/src/teardown-context.ts b/addon/src/teardown-context.ts
index 518ad7177..a035af61b 100644
--- a/addon/src/teardown-context.ts
+++ b/addon/src/teardown-context.ts
@@ -29,6 +29,7 @@ export default function teardownContext(
   { waitForSettled = true }: TeardownContextOptions = {},
 ): Promise<void> {
   return Promise.resolve()
+    .then(settled)
     .then(() => {
       _cleanupOnerror(context);
       _teardownAJAXHooks();