diff --git a/app/i18n/en-US/highlighter.json b/app/i18n/en-US/highlighter.json
index 87ff899eb2d6..1c0cae21624e 100644
--- a/app/i18n/en-US/highlighter.json
+++ b/app/i18n/en-US/highlighter.json
@@ -142,5 +142,6 @@
   "Export Horizontal": "Export Horizontal",
   "Get highlights (Fortnite only)": "Get highlights (Fortnite only)",
   "My Stream Highlights": "My Stream Highlights",
-  "You cannot use special characters in this field": "You cannot use special characters in this field"
+  "You cannot use special characters in this field": "You cannot use special characters in this field",
+  "Please select at least one clip to export a video": "Please select at least one clip to export a video"
 }
\ No newline at end of file
diff --git a/app/services/highlighter/index.ts b/app/services/highlighter/index.ts
index 28a93fd12ee3..8596d95df2a2 100644
--- a/app/services/highlighter/index.ts
+++ b/app/services/highlighter/index.ts
@@ -1328,7 +1328,13 @@ export class HighlighterService extends PersistentStatefulService<IHighlighterSt
       console.error('Highlighter: Cannot export until current export operation is finished');
       return;
     }
-
+    this.SET_EXPORT_INFO({
+      exporting: true,
+      currentFrame: 0,
+      step: EExportStep.AudioMix,
+      cancelRequested: false,
+      error: null,
+    });
     let renderingClips: RenderingClip[] = [];
     if (streamId) {
       renderingClips = this.getClips(this.views.clips, streamId)
@@ -1407,6 +1413,11 @@ export class HighlighterService extends PersistentStatefulService<IHighlighterSt
 
     if (!renderingClips.length) {
       console.error('Highlighter: Export called without any clips!');
+      this.SET_EXPORT_INFO({
+        exporting: false,
+        exported: false,
+        error: $t('Please select at least one clip to export a video'),
+      });
       return;
     }
 
@@ -1419,12 +1430,7 @@ export class HighlighterService extends PersistentStatefulService<IHighlighterSt
     const totalFramesAfterTransitions = totalFrames - numTransitions * transitionFrames;
 
     this.SET_EXPORT_INFO({
-      exporting: true,
-      currentFrame: 0,
       totalFrames: totalFramesAfterTransitions,
-      step: EExportStep.AudioMix,
-      cancelRequested: false,
-      error: null,
     });
 
     let fader: AudioCrossfader | null = null;