diff --git a/Tests/LibWeb/Text/expected/navigation/remove-iframe-from-timeout-callback.txt b/Tests/LibWeb/Text/expected/navigation/remove-iframe-from-timeout-callback.txt
index 136d06384a4..73fdda35bab 100644
--- a/Tests/LibWeb/Text/expected/navigation/remove-iframe-from-timeout-callback.txt
+++ b/Tests/LibWeb/Text/expected/navigation/remove-iframe-from-timeout-callback.txt
@@ -1 +1 @@
-  
\ No newline at end of file
+PASS: did not crash 
diff --git a/Tests/LibWeb/Text/input/navigation/remove-iframe-from-timeout-callback.html b/Tests/LibWeb/Text/input/navigation/remove-iframe-from-timeout-callback.html
index e6de8c2e329..24bb8176ee0 100644
--- a/Tests/LibWeb/Text/input/navigation/remove-iframe-from-timeout-callback.html
+++ b/Tests/LibWeb/Text/input/navigation/remove-iframe-from-timeout-callback.html
@@ -1,12 +1,16 @@
-<script src="../include.js"></script>
-<div id="foo">
-    <iframe></iframe>
-    <script>
-        setTimeout(function () {
-            foo.remove();
-            // Pass (didn't crash)
-            internals.signalTextTestIsDone();
+<script src="../include.js"></script><div id="foo"><iframe></iframe><script>
+    setTimeout(function () {
+        foo.remove();
+        window.done = true;
+    }, 0);
+</script></div><iframe></iframe><script>
+    asyncTest(function (done) {
+        let internalId;
+        internalId = setInterval(function () {
+            if (window.done) {
+                clearInterval(internalId);
+                done();
+            }
         }, 0);
-    </script>
-</div>
-<iframe></iframe>
+    });
+</script>PASS: did not crash
diff --git a/Userland/Libraries/LibWeb/HTML/TraversableNavigable.cpp b/Userland/Libraries/LibWeb/HTML/TraversableNavigable.cpp
index 6f2cf6732b2..73993fac8a9 100644
--- a/Userland/Libraries/LibWeb/HTML/TraversableNavigable.cpp
+++ b/Userland/Libraries/LibWeb/HTML/TraversableNavigable.cpp
@@ -572,7 +572,7 @@ TraversableNavigable::HistoryStepResult TraversableNavigable::apply_the_history_
         // AD-HOC: Since currently populate_session_history_entry_document does not run in parallel
         //         we call spin_until to interrupt execution of this function and let document population
         //         to complete.
-        main_thread_event_loop().spin_processing_tasks_with_source_until(Task::Source::NavigationAndTraversal, [&] {
+        main_thread_event_loop().spin_until([&] {
             return !changing_navigable_continuations.is_empty() || completed_change_jobs == total_change_jobs;
         });