diff --git a/components/pages/posts/post/PostMedia.vue b/components/pages/posts/post/PostMedia.vue
index ac543f1b..ad53cd18 100644
--- a/components/pages/posts/post/PostMedia.vue
+++ b/components/pages/posts/post/PostMedia.vue
@@ -62,6 +62,7 @@
     switch (true) {
       case isVideo.value:
         createVideoPlayer()
+
         break
 
       case isAnimatedMedia.value:
@@ -115,6 +116,10 @@
 
         fillToContainer: true,
 
+        autoPlay: autoplayAnimatedMedia.value,
+
+        mute: autoplayAnimatedMedia.value,
+
         preload: 'none',
 
         loop: true,
diff --git a/pages/settings.vue b/pages/settings.vue
index 1653bb58..4d096ba5 100644
--- a/pages/settings.vue
+++ b/pages/settings.vue
@@ -136,9 +136,11 @@
         <!-- autoplayAnimatedMedia -->
         <li>
           <SettingSwitch v-model="autoplayAnimatedMedia">
-            <template #name> Autoplay GIFs</template>
+            <template #name> Autoplay GIFs & videos</template>
 
-            <template #description> Automatically play animated GIFs without requiring a click </template>
+            <template #description>
+              Automatically play animated GIFs and start videos muted without requiring a click
+            </template>
           </SettingSwitch>
         </li>
 
diff --git a/test/pages/settings.test.ts b/test/pages/settings.test.ts
index 809b3e92..e2575ac4 100644
--- a/test/pages/settings.test.ts
+++ b/test/pages/settings.test.ts
@@ -11,5 +11,6 @@ describe('/settings', async () => {
     await page.waitForSelector('h1')
 
     expect(await page.textContent('h1')).toBe('Settings')
+    expect(await page.textContent('main')).toContain('Autoplay GIFs & videos')
   })
 })