diff --git a/app/src/main/java/ru/vtosters/lite/music/cache/db/PlaylistCacheDb.java b/app/src/main/java/ru/vtosters/lite/music/cache/db/PlaylistCacheDb.java
index 2d895cda0..414707516 100644
--- a/app/src/main/java/ru/vtosters/lite/music/cache/db/PlaylistCacheDb.java
+++ b/app/src/main/java/ru/vtosters/lite/music/cache/db/PlaylistCacheDb.java
@@ -12,6 +12,7 @@ import com.vk.dto.music.MusicTrack;
 import com.vk.dto.music.Playlist;
 import org.json.JSONException;
 import org.json.JSONObject;
+import ru.vtosters.lite.music.cache.MusicCacheImpl;
 import ru.vtosters.lite.music.cache.helpers.PlaylistHelper;
 import ru.vtosters.lite.music.cache.helpers.TracklistHelper;
 import ru.vtosters.lite.utils.music.MusicCacheStorageUtils;
@@ -93,25 +94,31 @@ public class PlaylistCacheDb extends SQLiteOpenHelper implements AutoCloseable {
         // Delete the playlist
         deletePlaylist(id, ownerId);
 
-        // Delete each track, but only if it's not in any other playlists
+        // Delete each track from the playlist_tracks table
         for (MusicTrack track : tracks) {
             String trackId = track.y1();
-            if (!isTrackInAnyOtherPlaylist(trackId)) {
-                MusicCacheStorageUtils.removeTrackDirById(trackId);
+            removeTrackFromPlaylist(playlistId, trackId);
+
+            if (!isTrackInAnyOtherPlaylist(trackId, playlistId)) {
+                MusicCacheImpl.removeTrack(trackId);
+                Log.d("Playlist", "removed " + trackId);
             }
         }
+
+        // Delete all entries from the playlist_tracks table for this playlist
+        db.delete(Constants.TABLE_PLAYLIST_TRACKS, Constants.COLUMN_PLAYLIST_ID + " = ?", new String[]{playlistId});
     }
 
-    private boolean isTrackInAnyOtherPlaylist(String trackId) {
+    private boolean isTrackInAnyOtherPlaylist(String trackId, String playlistId) {
         SQLiteDatabase db = getReadableDatabase();
         Cursor cursor = db.query(
                 Constants.TABLE_PLAYLIST_TRACKS,
                 null,
-                Constants.COLUMN_TRACK_ID + " = ?",
-                new String[]{trackId},
+                Constants.COLUMN_TRACK_ID + " = ? AND " + Constants.COLUMN_PLAYLIST_ID + " != ?",
+                new String[]{trackId, playlistId},
                 null, null, null
         );
-        boolean exists = cursor.getCount() > 1;
+        boolean exists = cursor.getCount() > 0;
         cursor.close();
         return exists;
     }
diff --git a/app/src/main/java/ru/vtosters/lite/utils/music/MusicCacheStorageUtils.java b/app/src/main/java/ru/vtosters/lite/utils/music/MusicCacheStorageUtils.java
index a0ea4d54d..03db796c9 100644
--- a/app/src/main/java/ru/vtosters/lite/utils/music/MusicCacheStorageUtils.java
+++ b/app/src/main/java/ru/vtosters/lite/utils/music/MusicCacheStorageUtils.java
@@ -11,32 +11,32 @@ public class MusicCacheStorageUtils {
     }
 
     @SuppressWarnings("ResultOfMethodCallIgnored")
-    public static File getTrackDirById(final String trackId) {
-        final var res = new File(getCacheStorageDir(), trackId);
+    public static File getTrackDirById(String trackId) {
+        File res = new File(getCacheStorageDir(), trackId);
         res.mkdirs();
         return res;
     }
 
-    public static File getTrackFile(final String trackId) {
+    public static File getTrackFile(String trackId) {
         return new File(getTrackDirById(trackId), "track.mp3");
     }
 
     @SuppressWarnings("ResultOfMethodCallIgnored")
-    public static File getThumbDirById(final String trackId) {
-        final var res = new File(getTrackDirById(trackId), "thumbs");
+    public static File getThumbDirById(String trackId) {
+        File res = new File(getTrackDirById(trackId), "thumbs");
         res.mkdirs();
         return res;
     }
 
-    public static File getTrackThumb(final String trackId, final int factor) {
+    public static File getTrackThumb(String trackId, int factor) {
         return new File(getThumbDirById(trackId), "thumb_" + factor + ".png");
     }
 
-    public static void removeTrackDirById(final String trackId) {
+    public static void removeTrackDirById(String trackId) {
         IOUtils.deleteRecursive(getTrackDirById(trackId));
     }
 
     public static void clear() {
         IOUtils.deleteRecursive(getCacheStorageDir());
     }
-}
+}
\ No newline at end of file