diff --git a/server/gameserver/obstacle.cc b/server/gameserver/obstacle.cc
index d9f6bf4..6d60253 100644
--- a/server/gameserver/obstacle.cc
+++ b/server/gameserver/obstacle.cc
@@ -659,10 +659,12 @@ void Obstacle::OnCollisionTrigger(Creature* c, OptResult& opt_result)
     case kObstacleMine:
     case kObstacleTrap:
         {
-            AddObstacleBuff(c);
-            Explosion();
-            Die(c->room);
-            BroadcastFullState(c->room);
+            if (c->team_id != GetTeamId(c->room)) {
+                AddObstacleBuff(c);
+                Explosion();
+                Die(c->room);
+                BroadcastFullState(c->room);
+            }
         }
         break;
     default: