diff --git a/src/game/SpellAuraEffects.cpp b/src/game/SpellAuraEffects.cpp
index 1492d58694..6c2dd45123 100644
--- a/src/game/SpellAuraEffects.cpp
+++ b/src/game/SpellAuraEffects.cpp
@@ -2288,6 +2288,7 @@ void AuraEffect::HandleShapeshiftBoosts(Unit * target, bool apply) const
             break;
         case FORM_MOONKIN:
             spellId = 24905;
+            spellId2 = 69366;
             break;
         case FORM_FLIGHT:
             spellId = 33948;
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index e7e08b8323..f0c1636560 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -1849,6 +1849,14 @@ void Unit::CalcAbsorbResist(Unit *pVictim, SpellSchoolMask schoolMask, DamageEff
                     RemainingDamage -= int32(currentAbsorb * pVictim->GetTotalAttackPowerValue(BASE_ATTACK) / 100);
                     continue;
                 }
+                // Moonkin Form passive
+                if (spellProto->Id == 69366)
+                {
+                    //reduces all damage taken while Stunned
+                    if (unitflag & UNIT_FLAG_STUNNED)
+                        RemainingDamage -= RemainingDamage * currentAbsorb / 100;
+                    continue;
+                }
                 break;
             }
             case SPELLFAMILY_ROGUE: