diff --git a/apps/red-ui/src/app/modules/file-preview/components/view-switch/view-switch.component.html b/apps/red-ui/src/app/modules/file-preview/components/view-switch/view-switch.component.html
index 8b9919a48..ea31603d5 100644
--- a/apps/red-ui/src/app/modules/file-preview/components/view-switch/view-switch.component.html
+++ b/apps/red-ui/src/app/modules/file-preview/components/view-switch/view-switch.component.html
@@ -34,7 +34,7 @@
     <button
         (click)="switchView.emit('TEXT_HIGHLIGHTS')"
         [class.active]="viewModeService.isTextHighlights"
-        [disabled]="(canSwitchToRedactedView$ | async) === false"
+        [disabled]="(canSwitchToHighlightsView$ | async) === false"
         [matTooltip]="'file-preview.text-highlights-tooltip' | translate"
         class="red-tab"
         iqserHelpMode="highlights_view"
diff --git a/apps/red-ui/src/app/modules/file-preview/components/view-switch/view-switch.component.ts b/apps/red-ui/src/app/modules/file-preview/components/view-switch/view-switch.component.ts
index d781c086c..c3ef94673 100644
--- a/apps/red-ui/src/app/modules/file-preview/components/view-switch/view-switch.component.ts
+++ b/apps/red-ui/src/app/modules/file-preview/components/view-switch/view-switch.component.ts
@@ -17,6 +17,7 @@ export class ViewSwitchComponent {
 
     readonly canSwitchToDeltaView$: Observable<boolean>;
     readonly canSwitchToRedactedView$: Observable<boolean>;
+    readonly canSwitchToHighlightsView$: Observable<boolean>;
 
     constructor(
         readonly viewModeService: ViewModeService,
@@ -28,5 +29,9 @@ export class ViewSwitchComponent {
         );
 
         this.canSwitchToRedactedView$ = _stateService.file$.pipe(map(file => !file.analysisRequired && !file.excluded));
+
+        this.canSwitchToHighlightsView$ = _stateService.file$.pipe(
+            map(file => file.hasHighlights && !file.analysisRequired && !file.excluded),
+        );
     }
 }
diff --git a/libs/common-ui b/libs/common-ui
index 70b612823..37edb34d0 160000
--- a/libs/common-ui
+++ b/libs/common-ui
@@ -1 +1 @@
-Subproject commit 70b61282309cb290406c538b5218341cb4f1c40a
+Subproject commit 37edb34d0fc3cf49dd889e98f5ec3d39227649f5
diff --git a/libs/red-domain/src/lib/files/file.model.ts b/libs/red-domain/src/lib/files/file.model.ts
index d31172568..c47c6e092 100644
--- a/libs/red-domain/src/lib/files/file.model.ts
+++ b/libs/red-domain/src/lib/files/file.model.ts
@@ -50,6 +50,7 @@ export class File extends Entity<IFile> implements IFile, IRouterPath {
     readonly fileManipulationDate: string;
     readonly redactionModificationDate: string;
     readonly lastManualChangeDate?: string;
+    readonly hasHighlights: boolean;
 
     readonly statusSort: number;
     readonly cacheIdentifier?: string;
@@ -110,6 +111,7 @@ export class File extends Entity<IFile> implements IFile, IRouterPath {
         this.fileManipulationDate = file.fileManipulationDate ?? '';
         this.redactionModificationDate = file.redactionModificationDate ?? '';
         this.lastManualChangeDate = file.lastManualChangeDate;
+        this.hasHighlights = file.hasHighlights;
 
         this.statusSort = StatusSorter[this.workflowStatus];
         this.cacheIdentifier = btoa(this.fileManipulationDate ?? '');
diff --git a/libs/red-domain/src/lib/files/file.ts b/libs/red-domain/src/lib/files/file.ts
index c5cd09bca..cbdd0e21e 100644
--- a/libs/red-domain/src/lib/files/file.ts
+++ b/libs/red-domain/src/lib/files/file.ts
@@ -147,6 +147,8 @@ export interface IFile {
 
     readonly workflowStatus: WorkflowFileStatus;
 
+    readonly hasHighlights: boolean;
+
     /**
      * Last time the actual file was touched
      */