diff --git a/assets/base_game/shared/characters/monster-christmas.json b/assets/base_game/shared/characters/monster-christmas.json
index fc60d4b09..0f19ce84e 100644
--- a/assets/base_game/shared/characters/monster-christmas.json
+++ b/assets/base_game/shared/characters/monster-christmas.json
@@ -150,4 +150,4 @@
 	],
 	"sing_duration": 4,
 	"scale": 1
-}
\ No newline at end of file
+}
diff --git a/assets/base_game/shared/characters/monster.json b/assets/base_game/shared/characters/monster.json
index cf8a7c9e1..4f4998f23 100644
--- a/assets/base_game/shared/characters/monster.json
+++ b/assets/base_game/shared/characters/monster.json
@@ -150,4 +150,4 @@
 	],
 	"sing_duration": 4,
 	"scale": 1
-}
\ No newline at end of file
+}
diff --git a/source/objects/Note.hx b/source/objects/Note.hx
index 9b5051bc5..00fb46d42 100644
--- a/source/objects/Note.hx
+++ b/source/objects/Note.hx
@@ -248,6 +248,9 @@ class Note extends FlxSprite
 
 		this.prevNote = prevNote;
 		isSustainNote = sustainNote;
+		if (isSustainNote) {
+			noAnimation = true;
+		}
 		this.inEditor = inEditor;
 		this.moves = false;
 
diff --git a/source/states/PlayState.hx b/source/states/PlayState.hx
index 488735b74..3b3bb6705 100644
--- a/source/states/PlayState.hx
+++ b/source/states/PlayState.hx
@@ -3323,6 +3323,12 @@ class PlayState extends MusicBeatState
 		spawnHoldSplashOnNote(note);
 
 		if (!note.isSustainNote) invalidateNote(note);
+
+		if (note.gfNote || note.noteType == 'GF Sing') {
+            	    gf.holdTimer = 0;
+        	} else {
+            	    dad.holdTimer = 0;
+		}
 	}
 
 	public function goodNoteHit(note:Note):Void
@@ -3431,6 +3437,12 @@ class PlayState extends MusicBeatState
 		if(result != LuaUtils.Function_Stop && result != LuaUtils.Function_StopHScript && result != LuaUtils.Function_StopAll) callOnHScript('goodNoteHit', [note]);
 		spawnHoldSplashOnNote(note);
 		if(!note.isSustainNote) invalidateNote(note);
+
+		if (note.gfNote || note.noteType == 'GF Sing') {
+            	    gf.holdTimer = 0;
+        	} else {
+           	    boyfriend.holdTimer = 0;
+		}
 	}
 
 	public function invalidateNote(note:Note):Void {