diff --git a/src/components/Player.vue b/src/components/Player.vue
index fa441f4..fc5afa3 100644
--- a/src/components/Player.vue
+++ b/src/components/Player.vue
@@ -150,10 +150,10 @@ export default {
           this.skipToSecond(this.currentTrackParent.progress.progress);
         }
         this.currentTrackParent.progress = undefined;
-      } else {
-        // Try to fix SAFARI
-        this.audio.play();
       }
+      // Try to fix SAFARI
+      this.audio.play();
+
     },
     pushHistoryItem() {
       if (!this.currentUser._id) {
diff --git a/src/components/dialogs/ArtistViewer.vue b/src/components/dialogs/ArtistViewer.vue
index 027ac55..f24861d 100644
--- a/src/components/dialogs/ArtistViewer.vue
+++ b/src/components/dialogs/ArtistViewer.vue
@@ -154,7 +154,7 @@ export default {
       this.$store.dispatch("artists/uploadNewCover", this.selectedArtist);
     },
     loadUserProgress() {
-      if (!this.isPlaying || this.selectedTrack.parent.parent && this.selectedTrack.parent.parent._id != this.selectedArtist._id) {
+      if (!this.isPlaying || !this.selectedTrack.parent.parent || this.selectedTrack.parent.parent._id != this.selectedArtist._id) {
         this.$store.dispatch("user/getProgress", this.selectedArtist).then(() => {
           this.gotoTrack();
         });