diff --git a/THECHANGELOG.md b/THECHANGELOG.md
index c9096ae1bc0..3f06f7deb06 100644
--- a/THECHANGELOG.md
+++ b/THECHANGELOG.md
@@ -1,4 +1,6 @@
-1.21.0;
+1.21.1;
+
+Fixed Color Quants crashing the game if there were no notes on screen
 
 The chart loading system has been rewritten! As a result charts now load a LOT faster!
 The Gapple 1.5 tween is now smoother
diff --git a/source/PlayState.hx b/source/PlayState.hx
index c3265efbd4f..a7653718ecf 100644
--- a/source/PlayState.hx
+++ b/source/PlayState.hx
@@ -5346,7 +5346,7 @@ if (ClientPrefs.showNPS && (notesHitDateArray.length > 0 || oppNotesHitDateArray
 
 					if(!isPixelStage)
 					{
-						if (ClientPrefs.noteColorStyle == 'Quant-Based' && ClientPrefs.enableColorShader)
+						if (ClientPrefs.noteColorStyle == 'Quant-Based' && ClientPrefs.enableColorShader && notes.members[Std.int(notes.length-1)] != null && dunceNote.noteData == notes.members[Std.int(notes.length-1)].noteData)
 						{
 							dunceNote.colorSwap.hue = notes.members[Std.int(notes.length-1)].colorSwap.hue;
 							dunceNote.colorSwap.saturation = notes.members[Std.int(notes.length-1)].colorSwap.saturation;