diff --git a/src/main/java/net/atlas/combatify/mixin/ServerPlayerMixin.java b/src/main/java/net/atlas/combatify/mixin/ServerPlayerMixin.java
index 040d5fee..1dcb1950 100644
--- a/src/main/java/net/atlas/combatify/mixin/ServerPlayerMixin.java
+++ b/src/main/java/net/atlas/combatify/mixin/ServerPlayerMixin.java
@@ -298,7 +298,11 @@ public void adjustHitResults(HitResult newValue) {
 			oldHitResults.add(1, newValue);
 		else
 			oldHitResults.add(newValue);
-		oldHitResults.removeIf(hitResult -> oldHitResults.indexOf(hitResult) > currentAveragePing + 1);
+		oldHitResults.removeIf(hitResult -> {
+			if(oldHitResults.indexOf(hitResult) > currentAveragePing + 1)
+				hitResultToRotationMap.remove(hitResult);
+			return oldHitResults.indexOf(hitResult) > currentAveragePing + 1;
+		});
 		Float[] rotations = new Float[2];
 		rotations[0] = getYHeadRot() % 360;
 		rotations[1] = getXRot() % 360;