diff --git a/ElementX/Sources/Application/Navigation/NavigationCoordinators.swift b/ElementX/Sources/Application/Navigation/NavigationCoordinators.swift
index e17c24781..058b713c8 100644
--- a/ElementX/Sources/Application/Navigation/NavigationCoordinators.swift
+++ b/ElementX/Sources/Application/Navigation/NavigationCoordinators.swift
@@ -412,19 +412,17 @@ class NavigationSplitCoordinator: CoordinatorProtocol, ObservableObject, CustomS
 
 private struct NavigationSplitCoordinatorView: View {
     @State private var columnVisibility = NavigationSplitViewVisibility.all
-    @State private var isInSplitMode = true
     
     @Environment(\.horizontalSizeClass) private var horizontalSizeClass
-    @Environment(\.scenePhase) private var scenePhase
     
     @ObservedObject var navigationSplitCoordinator: NavigationSplitCoordinator
     
     var body: some View {
         Group {
-            if isInSplitMode {
-                navigationSplitView
-            } else {
+            if horizontalSizeClass == .compact {
                 navigationStack
+            } else {
+                navigationSplitView
             }
         }
         // This needs to be handled on the top level otherwise sheets
@@ -450,25 +448,6 @@ private struct NavigationSplitCoordinatorView: View {
             .animation(.elementDefault, value: navigationSplitCoordinator.overlayPresentationMode)
             .animation(.elementDefault, value: navigationSplitCoordinator.overlayModule)
         }
-        // Handle `horizontalSizeClass` changes breaking the navigation bar
-        // https://github.com/element-hq/element-x-ios/issues/617
-        .onChange(of: horizontalSizeClass) { _, newValue in
-            guard scenePhase != .background else {
-                return
-            }
-            
-            isInSplitMode = newValue == .regular
-        }
-        .onChange(of: scenePhase) { _, newValue in
-            guard newValue == .active else {
-                return
-            }
-            
-            isInSplitMode = horizontalSizeClass == .regular
-        }
-        .task {
-            isInSplitMode = horizontalSizeClass == .regular
-        }
     }
     
     /// The NavigationStack that will be used in compact layouts