diff --git a/src/components/Youtube.vue b/src/components/Youtube.vue
index dbf3df4..6db27f3 100644
--- a/src/components/Youtube.vue
+++ b/src/components/Youtube.vue
@@ -1,6 +1,6 @@
 <template>
   <iframe
-    :src="`https://www.youtube.com/embed/${videoId}?amp;start=${startTime}&autoplay=1&playsinline=1`"
+    :src="`https://www.youtube.com/embed/${videoId}?amp;start=${startTime}&end=${endTime}&autoplay=1&playsinline=1`"
     title="YouTube video player"
     allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
   ></iframe>
@@ -9,5 +9,6 @@
 defineProps<{
   videoId: string
   startTime: number
+  endTime: number
 }>()
 </script>
diff --git a/src/stores/auth.ts b/src/stores/auth.ts
index 3f20887..037fecc 100644
--- a/src/stores/auth.ts
+++ b/src/stores/auth.ts
@@ -59,6 +59,7 @@ export const useAuthStore = defineStore('auth', {
         id: user.id,
         walkOn: user.walkOn,
         walkOnTime: user.walkOnTime,
+        walkOnEndTime: user.walkOnEndTime,
       } satisfies Partial<User>
       if (prevName.data?.length == 0) {
         await supabase.from('users').insert(copy)
diff --git a/src/stores/game.ts b/src/stores/game.ts
index 010715d..74668bd 100644
--- a/src/stores/game.ts
+++ b/src/stores/game.ts
@@ -20,6 +20,7 @@ export const useGameStore = defineStore('game', {
 
     walkOn: null as string | null,
     walkOnTime: 0,
+    walkOnEndTime: 0,
 
     // Don't access controller directly, use getController()
     _controller: null as GameController | null,
@@ -45,6 +46,7 @@ export const useGameStore = defineStore('game', {
 
       this.walkOn = null
       this.walkOnTime = 0
+      this.walkOnEndTime = 0
       if (
         this.game &&
         this.gameState.userId &&
@@ -54,6 +56,7 @@ export const useGameStore = defineStore('game', {
         if (user) {
           this.walkOn = user.walkOn
           this.walkOnTime = user.walkOnTime
+          this.walkOnEndTime = user.walkOnEndTime
         }
       }
 
diff --git a/src/types/supabase.ts b/src/types/supabase.ts
index 8e409ba..5e5c927 100644
--- a/src/types/supabase.ts
+++ b/src/types/supabase.ts
@@ -171,6 +171,7 @@ export interface Database {
           id: string
           name: string
           walkOn: string | null
+          walkOnEndTime: number
           walkOnTime: number
         }
         Insert: {
@@ -178,6 +179,7 @@ export interface Database {
           id?: string
           name?: string
           walkOn?: string | null
+          walkOnEndTime?: number
           walkOnTime?: number
         }
         Update: {
@@ -185,6 +187,7 @@ export interface Database {
           id?: string
           name?: string
           walkOn?: string | null
+          walkOnEndTime?: number
           walkOnTime?: number
         }
         Relationships: []
diff --git a/src/views/GameView.vue b/src/views/GameView.vue
index 94c2618..828de1f 100644
--- a/src/views/GameView.vue
+++ b/src/views/GameView.vue
@@ -4,6 +4,7 @@
       v-if="gameStore.walkOn"
       :video-id="gameStore.walkOn"
       :start-time="gameStore.walkOnTime"
+      :end-time="gameStore.walkOnEndTime"
     >
     </Youtube>
   </div>
diff --git a/src/views/UserView.vue b/src/views/UserView.vue
index bd0172a..cc0efef 100644
--- a/src/views/UserView.vue
+++ b/src/views/UserView.vue
@@ -21,6 +21,13 @@
     type="number"
     @change="updateWalkOnTime"
   />
+  <label for="videoId">Walk-on Video End Time</label>
+  <input
+    id="walkOnEnd"
+    :value="usersStore.getCurrentUser?.walkOnEndTime"
+    type="number"
+    @change="updateWalkOnEndTime"
+  />
   <button @click="router.push({ name: 'password' })">Change Password</button>
   <div class="row">
     <button v-if="changed" id="discard" @click="discardChanges">
@@ -65,6 +72,13 @@ const updateWalkOnTime = (e: Event) => {
   changed.value = true
 }
 
+const updateWalkOnEndTime = (e: Event) => {
+  const el = e.target as HTMLInputElement
+  if (!usersStore.getCurrentUser) return
+  usersStore.getCurrentUser.walkOnEndTime = el.valueAsNumber
+  changed.value = true
+}
+
 const saveChanges = () => {
   if (!usersStore.getCurrentUser) return
   authStore.setUserParams(usersStore.getCurrentUser)