diff --git a/vrobbler/apps/music/models.py b/vrobbler/apps/music/models.py
index 5679b89..b67f6ad 100644
--- a/vrobbler/apps/music/models.py
+++ b/vrobbler/apps/music/models.py
@@ -404,7 +404,7 @@ class Album(TimeStampedModel):
 
 
 class Track(ScrobblableMixin):
-    COMPLETION_PERCENT = getattr(settings, "MUSIC_COMPLETION_PERCENT", 90)
+    COMPLETION_PERCENT = getattr(settings, "MUSIC_COMPLETION_PERCENT", 95)
 
     class Opinion(models.IntegerChoices):
         DOWN = -1, "Thumbs down"
diff --git a/vrobbler/apps/scrobbles/constants.py b/vrobbler/apps/scrobbles/constants.py
index b26b9a9..8050957 100644
--- a/vrobbler/apps/scrobbles/constants.py
+++ b/vrobbler/apps/scrobbles/constants.py
@@ -15,8 +15,7 @@ PLAY_AGAIN_MEDIA = {
 }
 
 MEDIA_END_PADDING_SECONDS = {
-    "Video": 1800,  # 30 min
-    "Track": 1,  # 1 second
+    "Video": 3600,  # 60 min
 }
 
 EXCLUDE_FROM_NOW_PLAYING = ("GeoLocation",)