diff --git a/ElementX/Sources/Application/Navigation/NavigationModule.swift b/ElementX/Sources/Application/Navigation/NavigationModule.swift
index a8d3f4bf7..247bcfe20 100644
--- a/ElementX/Sources/Application/Navigation/NavigationModule.swift
+++ b/ElementX/Sources/Application/Navigation/NavigationModule.swift
@@ -36,9 +36,11 @@ class NavigationModule: Identifiable, Hashable {
     
     func tearDown() {
         coordinator?.stop()
-        dismissalCallback?()
         coordinator = nil
+        
+        let callback = dismissalCallback
         dismissalCallback = nil
+        callback?()
     }
     
     nonisolated static func == (lhs: NavigationModule, rhs: NavigationModule) -> Bool {