diff --git a/app/src/main/java/bruhcollective/itaysonlab/libvkx/client/LibVKXClient.java b/app/src/main/java/bruhcollective/itaysonlab/libvkx/client/LibVKXClient.java
index 5be09b2e8..779f85a20 100644
--- a/app/src/main/java/bruhcollective/itaysonlab/libvkx/client/LibVKXClient.java
+++ b/app/src/main/java/bruhcollective/itaysonlab/libvkx/client/LibVKXClient.java
@@ -46,8 +46,6 @@ public class LibVKXClient{
     }
 
     public static boolean play(MusicTrack musicTrack, List<MusicTrack> list, MusicPlaybackLaunchContext playerRefer){
-        scrobbleTrack(musicTrack.h, musicTrack.C, musicTrack.f, musicTrack.y1());
-
         if (!isIntegrationEnabled()) {
             return false;
         }
diff --git a/app/src/main/java/ru/vtosters/lite/hooks/PhotoViewer.java b/app/src/main/java/ru/vtosters/lite/hooks/PhotoViewer.java
index 555d8fb99..27907394b 100644
--- a/app/src/main/java/ru/vtosters/lite/hooks/PhotoViewer.java
+++ b/app/src/main/java/ru/vtosters/lite/hooks/PhotoViewer.java
@@ -3,6 +3,7 @@ package ru.vtosters.lite.hooks;
 import static ru.vtosters.lite.utils.AndroidUtils.getIdentifier;
 import static ru.vtosters.lite.utils.AndroidUtils.getPreferences;
 
+import android.annotation.SuppressLint;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
@@ -52,6 +53,7 @@ public class PhotoViewer {
         return true;
     }
 
+    @SuppressLint("UseCompatLoadingForDrawables")
     public static void addMenuItems(AttachmentWithMedia attachment, ActionsPopup.b actionPopup, int i, boolean z) {
         actionPopup.a(getIdentifier("search_photo_content", "string"),
                 ThemesUtils.isDarkTheme()
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 4be8fa7e6..1c586d6f7 100644
--- a/app/src/main/java/ru/vtosters/lite/music/Scrobbler.java
+++ b/app/src/main/java/ru/vtosters/lite/music/Scrobbler.java
@@ -1,5 +1,4 @@
 package ru.vtosters.lite.music;
-import static java.lang.String.*;
 import static java.lang.String.valueOf;
 import static ru.vtosters.lite.utils.AndroidUtils.MD5;
 import static ru.vtosters.lite.utils.AndroidUtils.edit;
@@ -9,6 +8,8 @@ import static ru.vtosters.lite.utils.AndroidUtils.sendToast;
 
 import android.util.Log;
 
+import com.vk.dto.music.MusicTrack;
+
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -22,7 +23,6 @@ import ru.vtosters.lite.net.NetCallback;
 import ru.vtosters.lite.net.NetClient;
 import ru.vtosters.lite.net.NetRequest;
 import ru.vtosters.lite.net.NetResponse;
-import ru.vtosters.lite.utils.Preferences;
 
 public class Scrobbler{
     private static final String key = "5965d63402414776c54c266db0211746";
@@ -73,6 +73,20 @@ public class Scrobbler{
         });
     }
 
+    public static void grabMusicTrack(MusicTrack musictrack) {
+        var uid = musictrack.y1();
+        var artist = musictrack.C;
+        var title = musictrack.f;
+        var duration = musictrack.h;
+
+        if (uid.isEmpty() || artist == null || artist.isEmpty() || title == null || title.isEmpty() || duration == 0) {
+            Log.d("Scrobbler", "grabTrackInfo: " + "Empty track, info: " + artist + " - " + title + " - " + duration + " - " + uid);
+            return;
+        }
+
+        scrobbleTrack(duration, artist, title, uid);
+    }
+
     private static String signMD5(Map<String, String> map){
         var sb = new StringBuilder();
 
diff --git a/smali/smali_classes4/com/vtosters/lite/audio/player/ExoPlayerHelper.smali b/smali/smali_classes4/com/vtosters/lite/audio/player/ExoPlayerHelper.smali
index b1e5ae340..68cb035b1 100644
--- a/smali/smali_classes4/com/vtosters/lite/audio/player/ExoPlayerHelper.smali
+++ b/smali/smali_classes4/com/vtosters/lite/audio/player/ExoPlayerHelper.smali
@@ -703,6 +703,8 @@
 
     .line 17
     :cond_0
+    invoke-static {p1}, Lru/vtosters/lite/music/Scrobbler;->grabMusicTrack(Lcom/vk/dto/music/MusicTrack;)V
+
     invoke-virtual {p1}, Lcom/vk/dto/music/MusicTrack;->y1()Ljava/lang/String;
 
     move-result-object p1