diff --git a/source/PlayState.hx b/source/PlayState.hx
index 6ad2c23a362..7a67e91f268 100644
--- a/source/PlayState.hx
+++ b/source/PlayState.hx
@@ -8239,7 +8239,7 @@ if (!allSicks && ClientPrefs.colorRatingHit && ClientPrefs.hudType != 'Tails Get
 				var spr:StrumNote = playerStrums.members[note.noteData];
 
 				if(spr != null) {
-				if (ClientPrefs.showNotes && ClientPrefs.enableColorShader) {
+				if ((ClientPrefs.noteColorStyle == 'Quant-Based' || ClientPrefs.rainbowNotes) && ClientPrefs.showNotes) {
 				spr.playAnim('confirm', true, note.colorSwap.hue, note.colorSwap.saturation, note.colorSwap.brightness);
 				} else {
 				spr.playAnim('confirm', true, 0, 0, 0, ClientPrefs.noteColorStyle == 'Char-Based', note.mustPress, note.gfNote);
@@ -8251,7 +8251,7 @@ if (!allSicks && ClientPrefs.colorRatingHit && ClientPrefs.hudType != 'Tails Get
 				var spr = playerStrums.members[note.noteData];
 				if(spr != null)
 				{
-				if (ClientPrefs.showNotes && ClientPrefs.enableColorShader) {
+				if ((ClientPrefs.noteColorStyle == 'Quant-Based' || ClientPrefs.rainbowNotes) && ClientPrefs.showNotes) {
 				spr.playAnim('confirm', true, note.colorSwap.hue, note.colorSwap.saturation, note.colorSwap.brightness);
 				} else {
 				spr.playAnim('confirm', true, 0, 0, 0, ClientPrefs.noteColorStyle == 'Char-Based', note.mustPress, note.gfNote);
@@ -8431,7 +8431,7 @@ if (!allSicks && ClientPrefs.colorRatingHit && ClientPrefs.hudType != 'Tails Get
 					final spr:StrumNote = opponentStrums.members[daNote.noteData];
 
 					if(spr != null) {
-					if (ClientPrefs.showNotes && ClientPrefs.enableColorShader) {
+					if ((ClientPrefs.noteColorStyle == 'Quant-Based' || ClientPrefs.rainbowNotes) && ClientPrefs.showNotes) {
 					spr.playAnim('confirm', true, daNote.colorSwap.hue, daNote.colorSwap.saturation, daNote.colorSwap.brightness);
 					} else {
 					spr.playAnim('confirm', true, 0, 0, 0, ClientPrefs.noteColorStyle == 'Char-Based', false, daNote.gfNote);