diff --git a/ElementX/Sources/FlowCoordinators/ChatsTabFlowCoordinator.swift b/ElementX/Sources/FlowCoordinators/ChatsTabFlowCoordinator.swift
index 6c94808bf..66cab87fd 100644
--- a/ElementX/Sources/FlowCoordinators/ChatsTabFlowCoordinator.swift
+++ b/ElementX/Sources/FlowCoordinators/ChatsTabFlowCoordinator.swift
@@ -212,6 +212,14 @@ class ChatsTabFlowCoordinator: FlowCoordinatorProtocol {
                                                                                       userIndicatorController: flowParameters.userIndicatorController,
                                                                                       bugReportService: flowParameters.bugReportService,
                                                                                       userSession: userSession))
+                bugReportFlowCoordinator?.actionsPublisher.sink { [weak self] action in
+                    switch action {
+                    case .complete:
+                        self?.stateMachine.processEvent(.dismissedFeedbackScreen)
+                    }
+                }
+                .store(in: &cancellables)
+                
                 bugReportFlowCoordinator?.start()
             case (.feedbackScreen, .dismissedFeedbackScreen, .roomList):
                 break