diff --git a/services/web/frontend/js/features/ide-react/context/review-panel/hooks/use-review-panel-state.ts b/services/web/frontend/js/features/ide-react/context/review-panel/hooks/use-review-panel-state.ts
index e95eba51fd..43db1a236e 100644
--- a/services/web/frontend/js/features/ide-react/context/review-panel/hooks/use-review-panel-state.ts
+++ b/services/web/frontend/js/features/ide-react/context/review-panel/hooks/use-review-panel-state.ts
@@ -872,7 +872,9 @@ function useReviewPanelState(): ReviewPanel.ReviewPanelState {
         return { ...prevState, [threadId]: thread }
       })
       setResolvedThreadIds(prevState => ({ ...prevState, [threadId]: true }))
-      dispatchReviewPanelEvent('comment:resolve_threads', [threadId])
+      setTimeout(() => {
+        dispatchReviewPanelEvent('comment:resolve_threads', [threadId])
+      })
     },
     [getThread]
   )
@@ -916,7 +918,9 @@ function useReviewPanelState(): ReviewPanel.ReviewPanelState {
       setResolvedThreadIds(({ [threadId]: _, ...resolvedThreadIds }) => {
         return resolvedThreadIds
       })
-      dispatchReviewPanelEvent('comment:unresolve_thread', threadId)
+      setTimeout(() => {
+        dispatchReviewPanelEvent('comment:unresolve_thread', threadId)
+      })
     },
     [getThread]
   )