diff --git a/src/utils/Activity.ts b/src/utils/Activity.ts
index 7b4c725..c2b88aa 100644
--- a/src/utils/Activity.ts
+++ b/src/utils/Activity.ts
@@ -38,37 +38,23 @@ export async function setActivity({
     }
   };
 
-  const getStatusDisplayType = () => {
-    switch (statusName) {
-      case 'song_title':
-      case 'artists_and_title':
-      case 'title_and_artists':
-        return 2;
-      case 'artists_song':
-        return 1;
-      default:
-        return 0;
-    }
+  const getTrackTitle = () => {
+    if (trackTitle.length == 1) return trackTitle.concat(' ');
+    return trackTitle;
   };
 
-  const getActivityDetails = () => {
+  const getStatusName = () => {
     switch (statusName) {
+      case 'song_title':
+        return trackTitle;
+      case 'artists_song':
+        return trackArtists;
       case 'artists_and_title':
         return `${trackArtists} - ${trackTitle}`;
       case 'title_and_artists':
         return `${trackTitle} - ${trackArtists}`;
       default:
-        return trackTitle;
-    }
-  };
-
-  const getActivityState = () => {
-    switch (statusName) {
-      case 'artists_and_title':
-      case 'title_and_artists':
-        return undefined;
-      default:
-        return trackArtists;
+        return 'Deezer';
     }
   };
 
@@ -79,10 +65,10 @@ export async function setActivity({
 
   client.user.setActivity({
     type: ActivityType.Listening,
-    statusDisplayType: getStatusDisplayType(),
-    details: getActivityDetails(),
+    name: getStatusName(),
+    details: getTrackTitle(),
     detailsUrl: trackLink,
-    state: getActivityState(),
+    state: trackArtists,
     stateUrl: firstArtistId ? `https://www.deezer.com/artist/${firstArtistId}` : undefined,
     largeImageKey: albumCover,
     largeImageText: albumTitle,