diff --git a/src/main/java/com/projectswg/holocore/services/gameplay/combat/command/CombatCommandCommon.java b/src/main/java/com/projectswg/holocore/services/gameplay/combat/command/CombatCommandCommon.java
index 3f9449c82..7e136a267 100644
--- a/src/main/java/com/projectswg/holocore/services/gameplay/combat/command/CombatCommandCommon.java
+++ b/src/main/java/com/projectswg/holocore/services/gameplay/combat/command/CombatCommandCommon.java
@@ -77,7 +77,7 @@ public class CombatCommandCommon {
 		combatSpam.setDefenderPosition(target.getLocation().getPosition());
 		combatSpam.setInfo(info);
 		combatSpam.setAttackName(new StringId("cmd_n", command.getName()));
-		combatSpam.setSpamType(CombatSpamFilterType.ALL);
+		combatSpam.setSpamType(info.isSuccess() ? CombatSpamFilterType.SELF : CombatSpamFilterType.ALL);
 		return combatSpam;
 	}