diff --git a/Themes/_fallback/BGAnimations/ScreenGameplay decorations/default.lua b/Themes/_fallback/BGAnimations/ScreenGameplay decorations/default.lua
index ec3bfd2073..8282ba3aa6 100644
--- a/Themes/_fallback/BGAnimations/ScreenGameplay decorations/default.lua	
+++ b/Themes/_fallback/BGAnimations/ScreenGameplay decorations/default.lua	
@@ -1,10 +1,11 @@
 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))
 	end;
 };
-
+end;
 return t;
\ No newline at end of file
diff --git a/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua b/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua
index 89383ab1b8..f46c102f86 100644
--- a/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua	
+++ b/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua	
@@ -168,12 +168,13 @@ t[#t+1] = Def.ActorFrame {
 	};
 	CreateStops();
 };
-
+if( not GAMESTATE:IsCourseMode() ) then
 t[#t+1] = Def.Actor{
 	JudgmentMessageCommand = function(self, params)
 		Scoring[GetUserPref("UserPrefScoringMode")](params, 
 			STATSMAN:GetCurStageStats():GetPlayerStageStats(params.Player))
 	end;
 };
+end;
 
 return t
diff --git a/src/ScoreKeeperNormal.cpp b/src/ScoreKeeperNormal.cpp
index 5c690af1fb..b3e106bfaf 100644
--- a/src/ScoreKeeperNormal.cpp
+++ b/src/ScoreKeeperNormal.cpp
@@ -263,6 +263,13 @@ void ScoreKeeperNormal::AddTapScore( TapNoteScore tns )
 
 void ScoreKeeperNormal::AddHoldScore( HoldNoteScore hns )
 {
+	if( GAMESTATE->IsCourseMode() )
+	{
+		if( hns == HNS_Held )
+			AddScoreInternal( TNS_W1 );
+		else if ( hns == HNS_LetGo )
+			AddScoreInternal( TNS_W4 ); // required for subtractive score display to work properly.
+	}
 }
 
 void ScoreKeeperNormal::AddTapRowScore( TapNoteScore score, const NoteData &nd, int iRow )