diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/MarkedForDeath.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/MarkedForDeath.java
index 615508a77..e2ec6e686 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/MarkedForDeath.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/MarkedForDeath.java
@@ -197,6 +197,30 @@ public class MarkedForDeath extends SkillActive
 			if (arrow.isDead() || !arrow.isValid() || arrow.isOnGround())
 				arrowIterator.remove();
 		}
+		
+		for (Iterator<Player> activeIterator = _active.iterator(); activeIterator.hasNext();) 
+		{
+			Player player = activeIterator.next();
+			
+			if (!player.isOnline())
+				activeIterator.remove();
+		}
+		
+		for (Iterator<LivingEntity> markedTimeIterator = _markedTime.keySet().iterator(); markedTimeIterator.hasNext();) 
+		{
+			LivingEntity markedTime = markedTimeIterator.next();
+			
+			if (markedTime.isDead() || !markedTime.isValid())
+				markedTimeIterator.remove();
+		}
+		
+		for (Iterator<LivingEntity> markedDamageIterator = _markedDamage.keySet().iterator(); markedDamageIterator.hasNext();) 
+		{
+			LivingEntity markedDamage = markedDamageIterator.next();
+			
+			if (markedDamage.isDead() || !markedDamage.isValid())
+				markedDamageIterator.remove();
+		}
 	}
 
 	@Override