diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel-entry.tsx b/services/web/frontend/js/features/review-panel-new/components/review-panel-entry.tsx
index 1954baba52..c6b8937181 100644
--- a/services/web/frontend/js/features/review-panel-new/components/review-panel-entry.tsx
+++ b/services/web/frontend/js/features/review-panel-new/components/review-panel-entry.tsx
@@ -1,4 +1,4 @@
-import { FC, useCallback, useState } from 'react'
+import { FC, useCallback, useEffect, useState } from 'react'
 import { AnyOperation } from '../../../../../types/change'
 import {
   useCodeMirrorStateContext,
@@ -44,6 +44,15 @@ export const ReviewPanelEntry: FC<{
     setFocused(true)
   }, [selectLineOnFocus, docId, openDocId, position])
 
+  // Clear op highlight on dismount
+  useEffect(() => {
+    return () => {
+      if (hoverRanges) {
+        view.dispatch(clearHighlightRanges(op))
+      }
+    }
+  }, []) // eslint-disable-line react-hooks/exhaustive-deps
+
   return (
     <div
       onFocus={focusHandler}