diff --git a/MyMusicClientSveltePwa/package.json b/MyMusicClientSveltePwa/package.json
index 562abf4..709d959 100644
--- a/MyMusicClientSveltePwa/package.json
+++ b/MyMusicClientSveltePwa/package.json
@@ -1,7 +1,7 @@
 {
   "name": "mymusicclientsveltepwa",
   "private": true,
-  "version": "0.1.12",
+  "version": "0.1.121",
   "type": "module",
   "scripts": {
     "dev": "vite --host",
diff --git a/MyMusicClientSveltePwa/src/lib/scripts/playbackService.js b/MyMusicClientSveltePwa/src/lib/scripts/playbackService.js
index 955c552..dea1447 100644
--- a/MyMusicClientSveltePwa/src/lib/scripts/playbackService.js
+++ b/MyMusicClientSveltePwa/src/lib/scripts/playbackService.js
@@ -109,7 +109,17 @@ export function initializePlaybackService() {
 
   audioElement.addEventListener("error", (e) => {
     console.error("Error loading audio:", e);
+    // Retry
+    audioElement.load();
+    isLoading.set(true);
   });
+
+  audioElement.addEventListener("abort", (e) => {
+    console.error("Abort loading audio:", e);
+    // Retry
+    audioElement.load();
+    isLoading.set(true);
+  })
 }
 
 export function nextSong() {
@@ -143,10 +153,10 @@ export function playOrPauseSong(songId) {
     songIndex = playlistSongs.findIndex((song) => song.id === songId);
     audioElement.src = getPlaybackUrl(song.source_id);
     audioElement.load();
+    isLoading.set(true);
     currentSong.set(playlistSongs.find((song) => song.id === songId));
     isPlaying.set(false); // set to false since this is a new song
     setCurrentSongIndex(songIndex);
-    isLoading.set(true);
   }
   else if (get(isPlaying)) {
     audioElement.pause();