diff --git a/packages/frontend-2/lib/viewer/composables/setup.ts b/packages/frontend-2/lib/viewer/composables/setup.ts
index a1f32da95..b85ac83a7 100644
--- a/packages/frontend-2/lib/viewer/composables/setup.ts
+++ b/packages/frontend-2/lib/viewer/composables/setup.ts
@@ -101,6 +101,7 @@ import { useMeasurementsSetup } from '~/lib/viewer/composables/setup/measurement
 import { useFiltersSetup } from '~/lib/viewer/composables/setup/filters'
 import { useViewerPanelsSetup } from '~/lib/viewer/composables/setup/panels'
 import { ViewerRenderPageType } from '~/lib/viewer/helpers/state'
+import { HighlightExtension } from '~/lib/viewer/composables/setup/highlighting'
 
 export type LoadedModel = NonNullable<
   Get<ViewerLoadedResourcesQuery, 'project.models.items[0]'>
@@ -448,6 +449,7 @@ function createViewerDataBuilder(params: { viewerDebug: boolean }) {
       ...DefaultViewerParams,
       verbose: !!(import.meta.client && params.viewerDebug)
     })
+    viewer.createExtension(HighlightExtension)
     viewer.createExtension(PassReader)
     const initPromise = viewer.init()
 
diff --git a/packages/frontend-2/lib/viewer/composables/setup/highlighting.ts b/packages/frontend-2/lib/viewer/composables/setup/highlighting.ts
index 9361720e1..6e06ced46 100644
--- a/packages/frontend-2/lib/viewer/composables/setup/highlighting.ts
+++ b/packages/frontend-2/lib/viewer/composables/setup/highlighting.ts
@@ -55,9 +55,6 @@ export const useHighlightingPostSetup = () => {
 
   if (pageType.value === ViewerRenderPageType.Presentation) return
 
-  // Create the highlighting extension once during setup
-  instance.createExtension(HighlightExtension)
-
   // Get the highlighting extension instance
   const getHighlightExtensionInstance = () => instance.getExtension(HighlightExtension)