diff --git a/src/components/BlocksemblerChallengeSkipButton.vue b/src/components/BlocksemblerChallengeSkipButton.vue
index 1a8d671..ddb4c5e 100644
--- a/src/components/BlocksemblerChallengeSkipButton.vue
+++ b/src/components/BlocksemblerChallengeSkipButton.vue
@@ -30,7 +30,7 @@ let skip = async () => {
 <template>
   <BaseButton :disabled="!allowSkip || codingWorkspaceState.currentExercise?.id === FINAL_EXERCISE.id" @click="skip">
     <SkipForwardIcon/>
-    Skip Exercise <span v-if="!allowSkip">({{ formatTime(remainingTime) }})</span>
+    Skip Exercise <span v-if="!allowSkip && codingWorkspaceState.currentExercise?.id !== FINAL_EXERCISE.id">({{ formatTime(remainingTime) }})</span>
   </BaseButton>
 </template>
 
diff --git a/src/components/BlocksemblerCodeSubmissionButton.vue b/src/components/BlocksemblerCodeSubmissionButton.vue
index cb9180f..ca1b84d 100644
--- a/src/components/BlocksemblerCodeSubmissionButton.vue
+++ b/src/components/BlocksemblerCodeSubmissionButton.vue
@@ -73,7 +73,7 @@ const pollJobStatus = async (jobId: string) => {
     <TrophyIcon v-if="!isSubmitting"/>
     <span v-if="isSubmitting" aria-hidden="true" class="spinner-border spinner-border-sm me-2" role="status"></span>
     <span> Submit Solution</span>
-    <span v-if="!allowSubmission">({{ formatTime(remainingTime) }})</span>
+    <span v-if="!allowSubmission && codingWorkspaceState.currentExercise?.id !== FINAL_EXERCISE.id">({{ formatTime(remainingTime) }})</span>
   </BaseButton>
 </template>