diff --git a/src/routes/WatchVideo.vue b/src/routes/WatchVideo.vue
index d17d8d5..fcf57f9 100644
--- a/src/routes/WatchVideo.vue
+++ b/src/routes/WatchVideo.vue
@@ -6,7 +6,7 @@
       :video="video"
       :skip-to-time="'t' in $route.query ? Number($route.query.t) : null"
       :sponsors="sponsors"
-      :selectedAutoPlay="$store.getters['prefs/getPreferenceBoolean']('autoplay')"
+      :selectedAutoPlay="isAutoplayEnabled"
       :selectedAutoLoop="selectedAutoLoop"
       @videoEnded="videoEnded"
     />
@@ -70,7 +70,7 @@
             </div>
             <div>
               <!-- TODO translate -->
-              <v-checkbox dense :value="isAutoplayEnabled" @change="onAutoplayChg" label="Autoplay next video" />
+              <v-checkbox dense :value="isAutoplayEnabled" @change="onAutoplayChg" label="Autoplay Next Video" />
               <v-checkbox dense v-model="selectedAutoLoop" label="Loop this video" />
             </div>
           </v-card-text>
@@ -306,7 +306,7 @@ export default {
   },
   computed: {
     isAutoplayEnabled () {
-      return this.$store.getters['prefs/getPreferenceBoolean']('autoplay')
+      return this.$store.getters['prefs/getPreferenceBoolean']('autoplay', false)
     }
   },
   components: {
diff --git a/src/store/prefs-store.js b/src/store/prefs-store.js
index 2da10b2..d3ddef3 100644
--- a/src/store/prefs-store.js
+++ b/src/store/prefs-store.js
@@ -6,6 +6,7 @@ const PrefsStore = {
     // Declaring boolean values here because v-simple-checkbox has a bug (???) which renders it unable to have internal state
     prefs: {
       playerAutoplay: true,
+      autoplay: false,
       listen: false
     }
   }),