diff --git a/Themes/_fallback/BGAnimations/ScreenCredits overlay.lua b/Themes/_fallback/BGAnimations/ScreenCredits overlay.lua
index c8dfe98f84..b695311480 100644
--- a/Themes/_fallback/BGAnimations/ScreenCredits overlay.lua	
+++ b/Themes/_fallback/BGAnimations/ScreenCredits overlay.lua	
@@ -150,7 +150,7 @@ for section in ivalues(sections) do
 end
 
 creditScroller.BeginCommand=function(self)
-	SCREENMAN:GetTopScreen():PostScreenMessage( "SM_BeginFadingOut", (t.SecondsPerItem * (#t + item_padding_start) + 5) );
+	SCREENMAN:GetTopScreen():PostScreenMessage( 'SM_MenuTimer', (creditScroller.SecondsPerItem * (#creditScroller + item_padding_start) + 10) );
 end;
 
 return Def.ActorFrame{
diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index 0be95067ad..194bbd99b9 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -4463,7 +4463,7 @@ Fallback="ScreenSplash"
 AllowStartToSkip=true
 NextScreen=Branch.TitleMenu()
 PrevScreen=Branch.TitleMenu()
-TimerSeconds=40
+
 TimerStealth=true
 ForceTimer=true
 TimerMetricsGroup="MenuTimerNoSound"
diff --git a/Themes/default/Sounds/_Music credits.redir b/Themes/default/Sounds/_Music credits.redir
index 153ddc018f..9a5dd42a27 100644
--- a/Themes/default/Sounds/_Music credits.redir	
+++ b/Themes/default/Sounds/_Music credits.redir	
@@ -1 +1 @@
-default/_Music credits (loop)
\ No newline at end of file
+default/_Music credits
\ No newline at end of file
diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini
index 58bc94911a..e8da6a3a63 100644
--- a/Themes/default/metrics.ini
+++ b/Themes/default/metrics.ini
@@ -2175,4 +2175,3 @@ ShowBPMDisplay=false
 [ScreenJukebox]
 
 [ScreenCredits]
-TimerSeconds=96