diff --git a/code/__DEFINES/combat/attack_types b/code/__DEFINES/combat/attack_types.dm
similarity index 100%
rename from code/__DEFINES/combat/attack_types
rename to code/__DEFINES/combat/attack_types.dm
diff --git a/code/modules/mob/living/living_active_parry.dm b/code/modules/mob/living/living_active_parry.dm
index 609312917e..21289e58d6 100644
--- a/code/modules/mob/living/living_active_parry.dm
+++ b/code/modules/mob/living/living_active_parry.dm
@@ -206,7 +206,7 @@
 		to_chat(src, "<span class='warning'>Your parry is interrupted!</span>")
 		end_parry_sequence()
 	var/datum/block_parry_data/data = get_parry_data()
-	if(attack_type && !(attack_type & data.parry_attack_types))
+	if(attack_type && (!(attack_type & data.parry_attack_types) || (attack_type & ATTACK_TYPE_PARRY_COUNTERATTACK)))		// if this attack is from a parry do not parry it lest we infinite loop.
 		return BLOCK_NONE
 	var/efficiency = get_parry_efficiency(attack_type)
 	switch(parrying)