diff --git a/server/gameserver/roomobstacle.cc b/server/gameserver/roomobstacle.cc
index 75531e4..1c13d12 100644
--- a/server/gameserver/roomobstacle.cc
+++ b/server/gameserver/roomobstacle.cc
@@ -195,7 +195,12 @@ void RoomObstacle::SpecExplosion()
                                          );
         }
     }
-    if (explosion_times_ >= meta->i->explosion_times()) {
+    int total_explosion_times = meta->i->explosion_times();
+    if (context_ability && context_ability->GetAttrAbs(kHAT_WeaponExplosionTime) > 0.001f) {
+        total_explosion_times + = context_ability->GetAttrAbs(kHAT_WeaponExplosionTime) /
+            obstacle->meta->i->explosion_interval();
+    }
+    if (explosion_times_ >= total_explosion_times) {
         room->xtimer.DeleteTimer(room->xtimer.GetRunningTimer());
         Die(room);
         BroadcastFullState(room);