diff --git a/src/packets.c b/src/packets.c
index bbde3f0..863a93f 100644
--- a/src/packets.c
+++ b/src/packets.c
@@ -611,11 +611,8 @@ do_bombdata (struct pkg_bombdata *b_dat, _net_addr * addr)
         && b_dat->state != BS_exploding)
         d_printf ("do_bombdata  WARNING : bomb explosion haven't finished\n");
 
-    if ((bomb->state == BS_ticking || bomb->state == BS_trigger) && (b_dat->state == BS_ticking || b_dat->state == BS_trigger)) { // handle push & kick special
-		if (bomb->mode != BM_normal)
-			map.bfield[(bomb->pos.x >> 8)][(bomb->pos.y >> 8)] = 0; //remove bomb at old location
-		else
-			map.bfield[(bomb->pos.x >> 8)][(bomb->pos.y >> 8)] = 1; //set bomb at position
+    if (bomb->state != BS_off && b_dat->state == BS_off) { // handle push & kick special
+		map.bfield[(bomb->pos.x >> 8)][(bomb->pos.y >> 8)] = 0; //remove bomb at old location
         stonelist_add (bomb->pos.x >> 8, bomb->pos.y >> 8);
     }