diff --git a/client/src/components/video.vue b/client/src/components/video.vue
index afe5d2d..a246631 100644
--- a/client/src/components/video.vue
+++ b/client/src/components/video.vue
@@ -339,10 +339,13 @@
 
     @Watch('muted')
     onMutedChanged(muted: boolean) {
-      if (this._video) {
+      if (this._video && this._video.muted != muted) {
         this._video.muted = muted
         this.startsMuted = muted
-        if (!muted) this.mutedOverlay = false
+      }
+
+      if (!muted) {
+        this.mutedOverlay = false
       }
     }
 
@@ -392,9 +395,9 @@
       this._video.addEventListener('canplaythrough', () => {
         this.$accessor.video.setPlayable(true)
         if (this.autoplay) {
+          // start as muted due to restrictive browsers autoplay policy
           if (this.startsMuted && (!document.hasFocus() || !this.$accessor.active)) {
             this.$accessor.video.setMuted(true)
-            this._video.muted = true
           }
 
           this.$nextTick(() => {
diff --git a/client/src/main.ts b/client/src/main.ts
index ffcb2a9..fd89014 100644
--- a/client/src/main.ts
+++ b/client/src/main.ts
@@ -29,15 +29,6 @@ new Vue({
   store,
   render: (h) => h(app),
   created() {
-    const click = () => {
-      this.$accessor.setActive()
-      if (this.$accessor.settings.autoplay && this.$accessor.video.playing) {
-        this.$accessor.video.setMuted(false)
-      }
-      window.removeEventListener('click', click, false)
-    }
-    window.addEventListener('click', click, false)
-
     this.$client.init(this)
     this.$accessor.initialise()
   },