diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index de8a899d3..bbe193b19 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -1503,11 +1503,14 @@ void Spell::EffectDummy(SpellEffectEntry const* effect)
                 }
                 case 42631:                                 // Fire Bomb (explode)
                 {
-                    if (!unitTarget)
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT)
                         return;
 
                     unitTarget->RemoveAurasDueToSpell(42629);
                     unitTarget->CastSpell(unitTarget, 42630, true);
+
+                    // despawn the bomb after exploding
+                    ((Creature*)unitTarget)->ForcedDespawn(3000);
                     return;
                 }
                 case 42793:                                 // Burn Body
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 450cb11be..f7ed5fbca 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "12527"
+ #define REVISION_NR "12528"
 #endif // __REVISION_NR_H__