diff --git a/DiscordMediaRP/DisMediaRP.cs b/DiscordMediaRP/DisMediaRP.cs
index a95aa07..eabeddc 100644
--- a/DiscordMediaRP/DisMediaRP.cs
+++ b/DiscordMediaRP/DisMediaRP.cs
@@ -152,6 +152,15 @@ public class DisMediaRP : IDisposable
         string? shuffle = (playbackInfo.IsShuffleActive ?? false)  ? "\ud83d\udd00" : null;
         
         this._currentStatus.State = string.Join(' ', repeatMode, shuffle, $"{timelineProperties.Position:hh\\:mm\\:ss}/{timelineProperties.EndTime:hh\\:mm\\:ss}");
+
+        if (mediaSession.ControlSession.GetPlaybackInfo().PlaybackStatus is
+            GlobalSystemMediaTransportControlsSessionPlaybackStatus.Playing)
+            this._currentStatus.Timestamps = new Timestamps()
+            {
+                End = DateTime.UtcNow.Add(timelineProperties.EndTime - timelineProperties.Position)
+            };
+        else
+            this._currentStatus.Timestamps = new Timestamps();
         
         this._discordRpcClient.SetPresence(this._currentStatus);
     }