diff --git a/ElementX/Sources/Application/AppCoordinator.swift b/ElementX/Sources/Application/AppCoordinator.swift
index d9a882a95..591c11d7d 100644
--- a/ElementX/Sources/Application/AppCoordinator.swift
+++ b/ElementX/Sources/Application/AppCoordinator.swift
@@ -277,7 +277,11 @@ class AppCoordinator: AppCoordinatorProtocol, AuthenticationCoordinatorDelegate,
         }
         
         stateMachine.addErrorHandler { context in
-            fatalError("Failed transition with context: \(context)")
+            if context.fromState == context.toState {
+                MXLog.error("Failed transition from equal states: \(context.fromState)")
+            } else {
+                fatalError("Failed transition with context: \(context)")
+            }
         }
     }
     
diff --git a/ElementX/Sources/FlowCoordinators/RoomFlowCoordinator.swift b/ElementX/Sources/FlowCoordinators/RoomFlowCoordinator.swift
index dbf87b58d..bc30116af 100644
--- a/ElementX/Sources/FlowCoordinators/RoomFlowCoordinator.swift
+++ b/ElementX/Sources/FlowCoordinators/RoomFlowCoordinator.swift
@@ -254,7 +254,11 @@ class RoomFlowCoordinator: FlowCoordinatorProtocol {
         }
         
         stateMachine.addErrorHandler { context in
-            fatalError("Failed transition with context: \(context)")
+            if context.fromState == context.toState {
+                MXLog.error("Failed transition from equal states: \(context.fromState)")
+            } else {
+                fatalError("Failed transition with context: \(context)")
+            }
         }
     }
     
diff --git a/ElementX/Sources/FlowCoordinators/UserSessionFlowCoordinator.swift b/ElementX/Sources/FlowCoordinators/UserSessionFlowCoordinator.swift
index a1f073ade..19fb2111a 100644
--- a/ElementX/Sources/FlowCoordinators/UserSessionFlowCoordinator.swift
+++ b/ElementX/Sources/FlowCoordinators/UserSessionFlowCoordinator.swift
@@ -209,7 +209,11 @@ class UserSessionFlowCoordinator: FlowCoordinatorProtocol {
         }
         
         stateMachine.addErrorHandler { context in
-            fatalError("Failed transition with context: \(context)")
+            if context.fromState == context.toState {
+                MXLog.error("Failed transition from equal states: \(context.fromState)")
+            } else {
+                fatalError("Failed transition with context: \(context)")
+            }
         }
     }