diff --git a/app/src/main/java/ru/vtosters/lite/downloaders/AudioDownloader.java b/app/src/main/java/ru/vtosters/lite/downloaders/AudioDownloader.java
index fc21fddf8..04536ffc9 100644
--- a/app/src/main/java/ru/vtosters/lite/downloaders/AudioDownloader.java
+++ b/app/src/main/java/ru/vtosters/lite/downloaders/AudioDownloader.java
@@ -1,6 +1,5 @@
 package ru.vtosters.lite.downloaders;
 
-import static ru.vtosters.lite.utils.AccountManagerUtils.getUserId;
 import static ru.vtosters.lite.utils.AndroidUtils.getString;
 
 import android.os.Environment;
@@ -20,6 +19,7 @@ import ru.vtosters.lite.music.downloader.AudioGet;
 import ru.vtosters.lite.music.downloader.PlaylistDownloader;
 import ru.vtosters.lite.music.downloader.TrackDownloader;
 import ru.vtosters.lite.music.notification.MusicNotificationBuilder;
+import ru.vtosters.lite.utils.AccountManagerUtils;
 import ru.vtosters.lite.utils.IOUtils;
 
 /**
@@ -67,7 +67,6 @@ public class AudioDownloader {
             trackFile.getParentFile().mkdirs();
         downloadM3U8(track, true);
         MusicNotificationBuilder.notifySavingToCache(track);
-        CacheDatabaseDelegate.insertTrack(track);
     }
 
     public static void cachePlaylist(Playlist playlist) {
@@ -85,7 +84,7 @@ public class AudioDownloader {
     public static void cacheAllAudios() {
         var tracks = AudioGet.getAudios();
 
-        var notificationId = getUserId();
+        var notificationId = AccountManagerUtils.getUserId();
         var notification = MusicNotificationBuilder.buildAllAudiosDownloadNotification(notificationId);
 
         PlaylistDownloader.cachePlaylist(
@@ -97,10 +96,10 @@ public class AudioDownloader {
     public static void downloadAllAudios() {
         var tracks = AudioGet.getAudios();
 
-        var notificationId = getUserId();
+        var notificationId = AccountManagerUtils.getUserId();
         var notification = MusicNotificationBuilder.buildAllAudiosDownloadNotification(notificationId);
 
-        var playlistName = "Audios of " + getUserId();
+        var playlistName = "Audios of " + AccountManagerUtils.getUserId();
 
         var musicPath = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MUSIC).getAbsolutePath();
         var downloadPath = musicPath + File.separator + playlistName;
diff --git a/app/src/main/java/ru/vtosters/lite/music/Scrobbler.java b/app/src/main/java/ru/vtosters/lite/music/Scrobbler.java
index ef830b238..b998920a9 100644
--- a/app/src/main/java/ru/vtosters/lite/music/Scrobbler.java
+++ b/app/src/main/java/ru/vtosters/lite/music/Scrobbler.java
@@ -12,6 +12,8 @@ import static ru.vtosters.lite.utils.Preferences.autocache;
 import android.os.RemoteException;
 import android.util.Log;
 
+import androidx.annotation.Nullable;
+
 import com.vk.dto.music.MusicTrack;
 
 import org.json.JSONException;
@@ -38,7 +40,7 @@ public class Scrobbler {
     private static final NetClient client = new NetClient.Builder().build();
     private static final ArrayList<String> scrobbled = new ArrayList<>();
 
-    public static void scrobbleTrack(long duration, String artist, String title, String uid) {
+    public static void scrobbleTrack(long duration, String artist, String title, String uid, @Nullable String album) {
         var string = getDefaultPrefs().getString("sessionKey", null);
         var timestamp = System.currentTimeMillis() / 1000;
 
@@ -60,6 +62,8 @@ public class Scrobbler {
         treeMap.put("sk", string);
         treeMap.put("artist[0]", artist);
         treeMap.put("track[0]", title);
+        if (album != null && !album.isEmpty())
+            treeMap.put("album[0]", album);
         treeMap.put("timestamp[0]", valueOf(timestamp));
         treeMap.put("api_key", key);
         treeMap.put("duration[0]", valueOf(duration));
@@ -85,6 +89,7 @@ public class Scrobbler {
         var artist = musictrack.C;
         var title = musictrack.f;
         var duration = musictrack.h;
+        var album = musictrack.I.getTitle();
 
         if (uid.isEmpty() || artist == null || artist.isEmpty() || title == null || title.isEmpty() || duration == 0) {
             Log.d("Scrobbler", "grabTrackInfo: " + "Empty track, info: " + artist + " - " + title + " - " + duration + " - " + uid);
@@ -105,7 +110,7 @@ public class Scrobbler {
             }
         }
 
-        scrobbleTrack(duration, artist, title, uid);
+        scrobbleTrack(duration, artist, title, uid, album);
     }
 
     private static String signMD5(Map<String, String> map) {