diff --git a/source/NoteSplash.hx b/source/NoteSplash.hx
index 5851be7fc..36acc86a0 100644
--- a/source/NoteSplash.hx
+++ b/source/NoteSplash.hx
@@ -31,17 +31,12 @@ class NoteSplash extends FlxSprite
 		alpha = 0.6;
 
 		animation.play('note' + noteData + '-' + FlxG.random.int(0, 1), true);
-		animation.curAnim.frameRate += FlxG.random.int(-2, 2);
+		animation.curAnim.frameRate = 24 + FlxG.random.int(-2, 2);
+		animation.finishCallback = function(name){
+			kill();
+		};
 		updateHitbox();
 
 		offset.set(width * 0.3, height * 0.3);
 	}
-
-	override function update(elapsed:Float)
-	{
-		if (animation.curAnim.finished)
-			kill();
-
-		super.update(elapsed);
-	}
 }