diff --git a/CHANGELOG b/CHANGELOG
index dd44b9eff2155de44a16b5a822e5f187d94038c9..97362e827c7759ff3add3776be427d7e24929fe7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,7 @@ Changelog
 
 - Front: added some unittests for the store (#55)
 - Front: fixed broken login redirection when 401
+- Front: Removed autoplay on page reload
 
 
 0.3.5 (2018-01-07)
diff --git a/front/src/components/audio/Track.vue b/front/src/components/audio/Track.vue
index c8627925ebdd404e4d8dc9887d8a0307c22705fd..a513c468f6792d2013bb25b6b4946a863be667a7 100644
--- a/front/src/components/audio/Track.vue
+++ b/front/src/components/audio/Track.vue
@@ -59,13 +59,15 @@ export default {
 
     },
     loaded: function () {
-      if (this.isCurrent && this.autoplay) {
+      if (this.isCurrent) {
         this.$store.commit('player/duration', this.$refs.audio.duration)
         if (this.startTime) {
           this.setCurrentTime(this.startTime)
         }
-        this.$store.commit('player/playing', true)
-        this.$refs.audio.play()
+        if (this.autoplay) {
+          this.$store.commit('player/playing', true)
+          this.$refs.audio.play()
+        }
       }
     },
     updateProgress: function () {
diff --git a/front/src/store/index.js b/front/src/store/index.js
index 507f0b5876772364185fb6654e0b0a25fe95c913..a5df7c2406e08daf0712aa940856233085ec4f61 100644
--- a/front/src/store/index.js
+++ b/front/src/store/index.js
@@ -37,7 +37,6 @@ export default new Vuex.Store({
       key: 'player',
       paths: [
         'player.looping',
-        'player.playing',
         'player.volume',
         'player.duration',
         'player.errored'],
@@ -45,21 +44,6 @@ export default new Vuex.Store({
         return mutation.type.startsWith('player/') && mutation.type !== 'player/currentTime'
       }
     }),
-    createPersistedState({
-      key: 'progress',
-      paths: ['player.currentTime'],
-      filter: (mutation) => {
-        let delay = 10
-        return mutation.type === 'player/currentTime' && parseInt(mutation.payload) % delay === 0
-      },
-      reducer: (state) => {
-        return {
-          player: {
-            currentTime: state.player.currentTime
-          }
-        }
-      }
-    }),
     createPersistedState({
       key: 'queue',
       filter: (mutation) => {