diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index 7f06d0bd3..13482de70 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -58,6 +58,11 @@
             {{ $t('settings.emoji_reactions_on_timeline') }}
           </Checkbox>
         </li>
+        <li>
+          <Checkbox v-model="virtualScrolling">
+            {{ $t('settings.virtual_scrolling') }}
+          </Checkbox>
+        </li>
       </ul>
     </div>
 
diff --git a/src/components/video_attachment/video_attachment.js b/src/components/video_attachment/video_attachment.js
index cf2848fd2..feba25221 100644
--- a/src/components/video_attachment/video_attachment.js
+++ b/src/components/video_attachment/video_attachment.js
@@ -20,6 +20,7 @@ const VideoAttachment = {
       this.setHasAudio(e)
       if (this.loopVideo) {
         this.$emit('play', { looping: true })
+        return
       }
       this.$emit('play')
     },
@@ -28,6 +29,8 @@ const VideoAttachment = {
     },
     setHasAudio (e) {
       const target = e.srcElement || e.target
+      // If hasAudio is true, we've already marked this video to have audio,
+      // videos can never lose audio so don't bother checking again.
       if (this.hasAudio) return
       if (typeof target.webkitAudioDecodedByteCount !== 'undefined') {
         // non-zero if video has audio track