diff --git a/persistence/persistence_suite_test.go b/persistence/persistence_suite_test.go
index 06bf15ccc..641450072 100644
--- a/persistence/persistence_suite_test.go
+++ b/persistence/persistence_suite_test.go
@@ -23,7 +23,7 @@ func TestPersistence(t *testing.T) {
 	//conf.Server.DbPath = "./test-123.db"
 	conf.Server.DbPath = "file::memory:?cache=shared&_foreign_keys=on"
 	defer db.Init()()
-	log.SetLevel(log.LevelError)
+	log.SetLevel(log.LevelFatal)
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "Persistence Suite")
 }
diff --git a/persistence/persistence_test.go b/persistence/persistence_test.go
index 66b17cb27..13e56bde1 100644
--- a/persistence/persistence_test.go
+++ b/persistence/persistence_test.go
@@ -4,7 +4,6 @@ import (
 	"context"
 
 	"github.com/navidrome/navidrome/db"
-	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -16,10 +15,6 @@ var _ = Describe("SQLStore", func() {
 	BeforeEach(func() {
 		ds = New(db.Db())
 		ctx = context.Background()
-		log.SetLevel(log.LevelFatal)
-	})
-	AfterEach(func() {
-		log.SetLevel(log.LevelError)
 	})
 	Describe("WithTx", func() {
 		Context("When block returns nil", func() {
diff --git a/persistence/playqueue_repository.go b/persistence/playqueue_repository.go
index fa21f184b..2037265d1 100644
--- a/persistence/playqueue_repository.go
+++ b/persistence/playqueue_repository.go
@@ -112,8 +112,8 @@ func (r *playQueueRepository) loadTracks(tracks model.MediaFiles) model.MediaFil
 		ids[i] = t.ID
 	}
 
-	// Break the list in chunks, up to 50 items, to avoid hitting SQLITE_MAX_FUNCTION_ARG limit
-	chunks := slice.BreakUp(ids, 50)
+	// Break the list in chunks, up to 500 items, to avoid hitting SQLITE_MAX_FUNCTION_ARG limit
+	chunks := slice.BreakUp(ids, 500)
 
 	// Query each chunk of media_file ids and store results in a map
 	mfRepo := NewMediaFileRepository(r.ctx, r.db)
@@ -131,9 +131,12 @@ func (r *playQueueRepository) loadTracks(tracks model.MediaFiles) model.MediaFil
 	}
 
 	// Create a new list of tracks with the same order as the original
-	newTracks := make(model.MediaFiles, len(tracks))
-	for i, t := range tracks {
-		newTracks[i] = trackMap[t.ID]
+	// Exclude tracks that are not in the DB anymore
+	newTracks := make(model.MediaFiles, 0, len(tracks))
+	for _, t := range tracks {
+		if track, ok := trackMap[t.ID]; ok {
+			newTracks = append(newTracks, track)
+		}
 	}
 	return newTracks
 }
diff --git a/persistence/playqueue_repository_test.go b/persistence/playqueue_repository_test.go
index 434ee6a12..95732654d 100644
--- a/persistence/playqueue_repository_test.go
+++ b/persistence/playqueue_repository_test.go
@@ -16,9 +16,10 @@ import (
 
 var _ = Describe("PlayQueueRepository", func() {
 	var repo model.PlayQueueRepository
+	var ctx context.Context
 
 	BeforeEach(func() {
-		ctx := log.NewContext(context.TODO())
+		ctx = log.NewContext(context.TODO())
 		ctx = request.WithUser(ctx, model.User{ID: "userid", UserName: "userid", IsAdmin: true})
 		repo = NewPlayQueueRepository(ctx, NewDBXBuilder(db.Db()))
 	})
@@ -51,6 +52,30 @@ var _ = Describe("PlayQueueRepository", func() {
 			AssertPlayQueue(another, actual)
 			Expect(countPlayQueues(repo, "userid")).To(Equal(1))
 		})
+
+		It("does not return tracks if they don't exist in the DB", func() {
+			// Add a new song to the DB
+			newSong := songRadioactivity
+			newSong.ID = "temp-track"
+			mfRepo := NewMediaFileRepository(ctx, NewDBXBuilder(db.Db()))
+
+			Expect(mfRepo.Put(&newSong)).To(Succeed())
+
+			// Create a playqueue with the new song
+			pq := aPlayQueue("userid", newSong.ID, 0, newSong, songAntenna)
+			Expect(repo.Store(pq)).To(Succeed())
+
+			// Delete the new song
+			Expect(mfRepo.Delete("temp-track")).To(Succeed())
+
+			// Retrieve the playqueue
+			actual, err := repo.Retrieve("userid")
+			Expect(err).ToNot(HaveOccurred())
+
+			// The playqueue should not contain the deleted track
+			Expect(actual.Items).To(HaveLen(1))
+			Expect(actual.Items[0].ID).To(Equal(songAntenna.ID))
+		})
 	})
 })