diff --git a/WorkflowModals/Sources/AnyModalToastContainer.swift b/WorkflowModals/Sources/AnyModalToastContainer.swift
index ec021c37..0aa865d1 100644
--- a/WorkflowModals/Sources/AnyModalToastContainer.swift
+++ b/WorkflowModals/Sources/AnyModalToastContainer.swift
@@ -187,7 +187,6 @@ public final class AnyModalToastContainerViewController: ScreenViewController<An
         }
 
         guard let host = modalHost else {
-
             // If we're not installed the view controller hierarchy, we don't expect to find a
             // host, but if we are and we don't have a modal host, that's a programmer error
             // since we cannot present our modals.
@@ -196,6 +195,10 @@ public final class AnyModalToastContainerViewController: ScreenViewController<An
                 return
             }
 
+            guard parent != nil else {
+                return
+            }
+
             guard view.window != nil else {
                 return
             }
diff --git a/WorkflowModals/Tests/ModalContainerTests.swift b/WorkflowModals/Tests/ModalContainerTests.swift
index f329c1b2..8bba4fbc 100644
--- a/WorkflowModals/Tests/ModalContainerTests.swift
+++ b/WorkflowModals/Tests/ModalContainerTests.swift
@@ -193,6 +193,69 @@ final class ModalContainerTests: XCTestCase {
             }
         }
     }
+
+    func test_modal_host_update_defers_when_view_has_window_without_parent() throws {
+        class HostViewController: UIViewController, ModalHost {
+
+            var updateModalsCount = 0
+            var aggregatedModalCount = 0
+
+            func setNeedsModalUpdate() {
+                updateModalsCount += 1
+                aggregatedModalCount = aggregateModals().modals.count
+            }
+        }
+
+        let modalScreen = ModalContainer<EmptyScreen, EmptyScreen>(
+            base: EmptyScreen(),
+            modals: []
+        )
+
+        let description = modalScreen.viewControllerDescription(environment: .empty)
+        let viewController = try XCTUnwrap(description.buildViewController() as? AnyModalToastContainerViewController)
+
+        let host = HostViewController()
+
+        show(vc: host) { host in
+            viewController.view.frame = host.view.bounds
+            host.view.addSubview(viewController.view)
+
+            XCTAssertNil(viewController.parent)
+            XCTAssertNotNil(viewController.view.window)
+
+            let updatedScreen = ModalContainer(
+                base: EmptyScreen(),
+                modals: [
+                    Modal(
+                        key: "first-modal",
+                        style: FullScreenModalStyle(),
+                        content: EmptyScreen()
+                    ),
+                ]
+            )
+
+            updatedScreen.viewControllerDescription(environment: .empty)
+                .update(viewController: viewController)
+            viewController.view.layoutIfNeeded()
+
+            XCTAssertEqual(host.updateModalsCount, 0)
+
+            viewController.view.removeFromSuperview()
+            host.addChild(viewController)
+            host.view.addSubview(viewController.view)
+            viewController.didMove(toParent: host)
+
+            viewController.view.setNeedsLayout()
+            viewController.view.layoutIfNeeded()
+
+            XCTAssertEqual(host.updateModalsCount, 1)
+            XCTAssertEqual(host.aggregatedModalCount, 1)
+
+            viewController.willMove(toParent: nil)
+            viewController.view.removeFromSuperview()
+            viewController.removeFromParent()
+        }
+    }
 }
 
 extension ModalContainerTests {