diff --git a/apps/dashboard/src/lib/components/Course/components/Lesson/Exercises/NewExerciseModal.svelte b/apps/dashboard/src/lib/components/Course/components/Lesson/Exercises/NewExerciseModal.svelte
index 11cd47a3..f33521ab 100644
--- a/apps/dashboard/src/lib/components/Course/components/Lesson/Exercises/NewExerciseModal.svelte
+++ b/apps/dashboard/src/lib/components/Course/components/Lesson/Exercises/NewExerciseModal.svelte
@@ -309,7 +309,12 @@
             variant={VARIANTS.TEXT}
             onClick={handleBack}
           />
-          <PrimaryButton className="px-6 py-3" label="Finish" onClick={handleAddExercise} />
+          <PrimaryButton
+            isDisabled={$isLoading || !note}
+            className="px-6 py-3"
+            label="Finish"
+            onClick={handleAddExercise}
+          />
         </div>
       </div>
     {/if}