diff --git a/Themes/Til Death/BGAnimations/superscoreboard.lua b/Themes/Til Death/BGAnimations/superscoreboard.lua
index ca384f47fc..06dd4a6130 100644
--- a/Themes/Til Death/BGAnimations/superscoreboard.lua	
+++ b/Themes/Til Death/BGAnimations/superscoreboard.lua	
@@ -258,6 +258,16 @@ local o =
 						self:settext("")
 					end
 				end
+			end,
+			CurrentSongChangedMessageCommand = function(self)
+				local online = DLMAN:IsLoggedIn()
+				if not GAMESTATE:GetCurrentSong() then
+					self:settext("")
+				elseif not online and #scoretable == 0 then
+					self:settext("Login to view scores")
+				else
+					self:settext("Retrieving scores...")
+				end
 			end
 		},
 	LoadFont("Common normal") ..
@@ -325,6 +335,9 @@ local function makeScoreDisplay(i)
 				self:visible(false)
 			end
 		end,
+		CurrentSongChangedMessageCommand = function(self)
+			self:visible(false)
+		end,
 		UpdateCommand = function(self)		
 			hs = scoretable[(i + ind)]
 			if hs and i <= numscores then