diff --git a/sql/updates/4464_world_spell_bonus_data_TDB.sql b/sql/updates/4464_world_spell_bonus_data_TDB.sql
new file mode 100644
index 0000000000..9d7bacd90b
--- /dev/null
+++ b/sql/updates/4464_world_spell_bonus_data_TDB.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_bonus_data` WHERE `entry` = '58621';
+INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `comments`) VALUES
+(58621, 0, 0, 0.08, 'Death Knight - Glyph of Chains of Ice');
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index d1e1ba821e..696c17fba8 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -10537,8 +10537,8 @@ void Unit::SetInCombatState(bool PvP, Unit* enemy)
     if(GetTypeId() != TYPEID_PLAYER)
     {
         //if(GetMotionMaster()->GetMotionSlotType(MOTION_SLOT_IDLE) != IDLE_MOTION_TYPE)
-        if (((Creature *)this)->GetMotionMaster()->GetCurrentMovementGeneratorType() == WAYPOINT_MOTION_TYPE)
-            ((Creature*)this)->SetHomePosition(GetPositionX(), GetPositionY(), GetPositionZ(), GetOrientation());
+        //if (((Creature *)this)->GetMotionMaster()->GetCurrentMovementGeneratorType() == WAYPOINT_MOTION_TYPE)
+            //((Creature*)this)->SetHomePosition(GetPositionX(), GetPositionY(), GetPositionZ(), GetOrientation());
         if(enemy)
         {
             if(((Creature*)this)->IsAIEnabled)