diff --git a/src/game/server/game_server.cpp b/src/game/server/game_server.cpp
index fc8718fbe..9ca153fd0 100644
--- a/src/game/server/game_server.cpp
+++ b/src/game/server/game_server.cpp
@@ -1221,6 +1221,9 @@ bool player::take_damage(vec2 force, int dmg, int from, int weapon)
 	// create healthmod indicator
 	create_damageind(pos, normalize(force), dmg);
 
+	if (gameobj.gametype == GAMETYPE_TDM && from >= 0 && players[from].team == team)
+		return false;
+
 	if(armor)
 	{
 		armor -= 1;