diff --git a/services/web/frontend/js/features/review-panel-new/context/ranges-context.tsx b/services/web/frontend/js/features/review-panel-new/context/ranges-context.tsx
index 019ed5ff00..1384d6f18f 100644
--- a/services/web/frontend/js/features/review-panel-new/context/ranges-context.tsx
+++ b/services/web/frontend/js/features/review-panel-new/context/ranges-context.tsx
@@ -21,6 +21,7 @@ import { postJSON } from '@/infrastructure/fetch-json'
 import { useIdeReactContext } from '@/features/ide-react/context/ide-react-context'
 import { useConnectionContext } from '@/features/ide-react/context/connection-context'
 import useSocketListener from '@/features/ide-react/hooks/use-socket-listener'
+import { throttle } from 'lodash'
 
 export type Ranges = {
   docId: string
@@ -97,11 +98,15 @@ export const RangesProvider: FC = ({ children }) => {
 
   useEffect(() => {
     if (currentDoc) {
-      const listener = () => {
-        window.setTimeout(() => {
-          setRanges(buildRanges(currentDoc))
-        })
-      }
+      const listener = throttle(
+        () => {
+          window.setTimeout(() => {
+            setRanges(buildRanges(currentDoc))
+          })
+        },
+        500,
+        { leading: true, trailing: true }
+      )
 
       // currentDoc.on('ranges:clear.cm6', listener)
       currentDoc.on('ranges:redraw.cm6', listener)