diff --git a/Themes/_fallback/BGAnimations/ScreenGameplay decorations/default.lua b/Themes/_fallback/BGAnimations/ScreenGameplay decorations/default.lua
index 8282ba3aa6..33baabebf0 100644
--- a/Themes/_fallback/BGAnimations/ScreenGameplay decorations/default.lua	
+++ b/Themes/_fallback/BGAnimations/ScreenGameplay decorations/default.lua	
@@ -3,8 +3,13 @@ local t = Def.ActorFrame {};
 if( not GAMESTATE:IsCourseMode() ) then
 t[#t+1] = Def.Actor{
 	JudgmentMessageCommand = function(self, params)
-		Scoring[GetUserPref("UserPrefScoringMode")](params, 
-			STATSMAN:GetCurStageStats():GetPlayerStageStats(params.Player))
+		if params.TapNoteScore and
+		   params.TapNoteScore ~= 'TapNoteScore_Invalid' and
+		   params.TapNoteScore ~= 'TapNoteScore_None'
+		then
+			Scoring[GetUserPref("UserPrefScoringMode")](params, 
+				STATSMAN:GetCurStageStats():GetPlayerStageStats(params.Player))
+		end
 	end;
 };
 end;
diff --git a/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua b/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua
index 8d884f7e80..ed2285c4a4 100644
--- a/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua	
+++ b/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua	
@@ -204,8 +204,13 @@ t[#t+1] = Def.ActorFrame {
 if( not GAMESTATE:IsCourseMode() ) then
 t[#t+1] = Def.Actor{
 	JudgmentMessageCommand = function(self, params)
-		Scoring[GetUserPref("UserPrefScoringMode")](params, 
-			STATSMAN:GetCurStageStats():GetPlayerStageStats(params.Player))
+		if params.TapNoteScore and
+		   params.TapNoteScore ~= 'TapNoteScore_Invalid' and
+		   params.TapNoteScore ~= 'TapNoteScore_None'
+		then
+			Scoring[GetUserPref("UserPrefScoringMode")](params, 
+				STATSMAN:GetCurStageStats():GetPlayerStageStats(params.Player))
+		end
 	end;
 };
 end;