diff --git a/editor/src/components/canvas/controls/comment-indicator.tsx b/editor/src/components/canvas/controls/comment-indicator.tsx
index a1420ce0d07e..47167eea1e39 100644
--- a/editor/src/components/canvas/controls/comment-indicator.tsx
+++ b/editor/src/components/canvas/controls/comment-indicator.tsx
@@ -165,7 +165,6 @@ const CommentIndicatorsInner = React.memo(() => {
       {temporaryIndicatorData != null ? (
         <CommentIndicatorUI
           position={temporaryIndicatorData.position}
-          opacity={1}
           resolved={false}
           bgColor={temporaryIndicatorData.bgColor}
           fgColor={temporaryIndicatorData.fgColor}
@@ -181,7 +180,6 @@ CommentIndicatorsInner.displayName = 'CommentIndicatorInner'
 
 interface CommentIndicatorUIProps {
   position: WindowPoint
-  opacity: number
   resolved: boolean
   bgColor: string
   fgColor: string
@@ -192,24 +190,13 @@ interface CommentIndicatorUIProps {
 }
 
 export const CommentIndicatorUI = React.memo<CommentIndicatorUIProps>((props) => {
-  const {
-    position,
-    bgColor,
-    fgColor,
-    avatarUrl,
-    avatarInitials,
-    opacity,
-    resolved,
-    isActive,
-    read,
-  } = props
+  const { position, bgColor, fgColor, avatarUrl, avatarInitials, resolved, isActive, read } = props
 
   function getIndicatorStyle() {
     const base: Interpolation<Theme> = {
       position: 'fixed',
       top: position.y + 3,
       left: position.x - 3,
-      opacity: opacity,
       filter: resolved ? 'grayscale(1)' : undefined,
       width: IndicatorSize,
       height: IndicatorSize,
@@ -339,7 +326,6 @@ const CommentIndicator = React.memo(({ thread }: CommentIndicatorProps) => {
         (isActive || !hovered) && !dragging,
         <CommentIndicatorUI
           position={position}
-          opacity={isOnAnotherRoute || thread.metadata.resolved ? 0 : 1}
           resolved={thread.metadata.resolved}
           bgColor={color.background}
           fgColor={color.foreground}
diff --git a/editor/src/core/commenting/comment-hooks.tsx b/editor/src/core/commenting/comment-hooks.tsx
index ac68553f94bd..f15f96b2128f 100644
--- a/editor/src/core/commenting/comment-hooks.tsx
+++ b/editor/src/core/commenting/comment-hooks.tsx
@@ -233,37 +233,32 @@ export function useResolveThread() {
 }
 
 export function useActiveThreads() {
-  const { threads: unresolvedThreads } = useUnresolvedThreads()
-  const { threads: resolvedThreads } = useResolvedThreads()
+  const { threads } = useThreads()
   const showResolved = useEditorState(
     Substores.restOfEditor,
     (store) => store.editor.showResolvedThreads,
     'useActiveThreads showResolved',
   )
   if (!showResolved) {
-    return unresolvedThreads
+    return threads.filter((t) => !t.metadata.resolved)
   }
-  return [...unresolvedThreads, ...resolvedThreads]
+  return threads
 }
 
 export function useResolvedThreads() {
-  return useThreads({
-    query: {
-      metadata: {
-        resolved: true,
-      },
-    },
-  })
+  const threads = useThreads()
+  return {
+    ...threads,
+    threads: threads.threads.filter((t) => t.metadata.resolved),
+  }
 }
 
 export function useUnresolvedThreads() {
-  return useThreads({
-    query: {
-      metadata: {
-        resolved: false,
-      },
-    },
-  })
+  const threads = useThreads()
+  return {
+    ...threads,
+    threads: threads.threads.filter((t) => !t.metadata.resolved),
+  }
 }
 
 export function useSetThreadReadStatusOnMount(thread: ThreadData<ThreadMetadata> | null) {