diff --git a/src/action/g_combat.c b/src/action/g_combat.c
index 4e0b8f5de..34f2a2b69 100644
--- a/src/action/g_combat.c
+++ b/src/action/g_combat.c
@@ -463,6 +463,11 @@ void T_Damage (edict_t * targ, edict_t * inflictor, edict_t * attacker, const ve
 
 	if ((targ->flags & FL_GODMODE) || targ->solid == SOLID_NOT) return; //rekkie -- specators don't take damage
 
+	// Add health check early to prevent processing dead entities
+	// Will need to accommodate for this if you want to gib dead bodies
+	if (targ->health <= 0 || !IS_ALIVE(targ))
+		return;
+
 	// do this before teamplay check
 	if (!targ->takedamage)
 		return;