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 0c8f6af51c..0b5e4794ad 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
@@ -297,6 +297,16 @@ function useReviewPanelState(): ReviewPanelStateReactIde {
     [resolvedComments]
   )
 
+  const getThread = useCallback(
+    (threadId: ThreadId) => {
+      return (
+        commentThreads[threadId] ??
+        ({ messages: [] } as ReviewPanelCommentThread)
+      )
+    },
+    [commentThreads]
+  )
+
   const updateEntries = useCallback(
     async (docId: DocId) => {
       const rangesTracker = getChangeTracker(docId)
@@ -830,8 +840,35 @@ function useReviewPanelState(): ReviewPanelStateReactIde {
     })
   }, [reviewPanelOpen, setReviewPanelOpen, trackChangesVisible])
 
-  const [unresolveComment] =
-    useScopeValue<ReviewPanel.UpdaterFn<'unresolveComment'>>('unresolveComment')
+  const onCommentReopened = useCallback(
+    (threadId: ThreadId) => {
+      setCommentThreads(prevState => {
+        const {
+          resolved: _1,
+          resolved_by_user: _2,
+          resolved_at: _3,
+          ...thread
+        } = getThread(threadId)
+        return { ...prevState, [threadId]: thread }
+      })
+      setResolvedThreadIds(({ [threadId]: _, ...resolvedThreadIds }) => {
+        return resolvedThreadIds
+      })
+      dispatchReviewPanelEvent('comment:unresolve_thread', threadId)
+    },
+    [getThread]
+  )
+
+  const unresolveComment = useCallback(
+    (threadId: ThreadId) => {
+      onCommentReopened(threadId)
+      const url = `/project/${projectId}/thread/${threadId}/reopen`
+      postJSON(url).catch(debugConsole.error)
+      sendMB('rp-comment-reopen')
+    },
+    [onCommentReopened, projectId]
+  )
+
   const [deleteThread] =
     useScopeValue<ReviewPanel.UpdaterFn<'deleteThread'>>('deleteThread')
   const [refreshResolvedCommentsDropdown] = useScopeValue<
@@ -924,6 +961,8 @@ function useReviewPanelState(): ReviewPanelStateReactIde {
     user.id,
   ])
 
+  useSocketListener(socket, 'reopen-thread', onCommentReopened)
+
   const values = useMemo<ReviewPanelStateReactIde['values']>(
     () => ({
       collapsed,
diff --git a/services/web/frontend/js/features/ide-react/scope-adapters/review-panel-context-adapter.ts b/services/web/frontend/js/features/ide-react/scope-adapters/review-panel-context-adapter.ts
index c3f2a4a89c..840f551c3a 100644
--- a/services/web/frontend/js/features/ide-react/scope-adapters/review-panel-context-adapter.ts
+++ b/services/web/frontend/js/features/ide-react/scope-adapters/review-panel-context-adapter.ts
@@ -18,7 +18,6 @@ export default function populateReviewPanelScope(store: ReactScopeValueStore) {
   store.set('deleteComment', () => {})
   store.set('gotoEntry', () => {})
   store.set('saveEdit', () => {})
-  store.set('unresolveComment', () => {})
   store.set('deleteThread', () => {})
   store.set('refreshResolvedCommentsDropdown', async () => {})
   store.set('acceptChanges', () => {})