diff --git a/ElementX/Sources/FlowCoordinators/UserSessionFlowCoordinatorStateMachine.swift b/ElementX/Sources/FlowCoordinators/UserSessionFlowCoordinatorStateMachine.swift
index 3defa519a..cbea83b59 100644
--- a/ElementX/Sources/FlowCoordinators/UserSessionFlowCoordinatorStateMachine.swift
+++ b/ElementX/Sources/FlowCoordinators/UserSessionFlowCoordinatorStateMachine.swift
@@ -205,12 +205,14 @@ class UserSessionFlowCoordinatorStateMachine {
     func addErrorHandler(_ handler: @escaping StateMachine<State, Event>.Handler) {
         stateMachine.addErrorHandler(handler: handler)
     }
-
+    
     /// Flag indicating the machine is displaying room screen with given room identifier
     func isDisplayingRoomScreen(withRoomID roomID: String) -> Bool {
         switch stateMachine.state {
         case .roomList(let selectedRoomID):
             return roomID == selectedRoomID
+        case .invitesScreen(let selectedRoomID):
+            return roomID == selectedRoomID
         default:
             return false
         }
diff --git a/changelog.d/2302.bugfix b/changelog.d/2302.bugfix
new file mode 100644
index 000000000..8bfc6843b
--- /dev/null
+++ b/changelog.d/2302.bugfix
@@ -0,0 +1 @@
+Fix room messages coming in as push notifications when inside a room when entering it from the invites list
\ No newline at end of file