diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index b6bfa245c..918729287 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -1914,7 +1914,15 @@ CreatureDataAddon const* Creature::GetCreatureAddon() const
         return addon;
 
     // dependent from difficulty mode entry
-    return ObjectMgr::GetCreatureTemplateAddon(GetCreatureInfo()->Entry);
+    if (GetEntry() != GetCreatureInfo()->Entry)
+    {
+        // If CreatureTemplateAddon for difficulty_entry_N exist, it's there for a reason
+        if (CreatureDataAddon const* addon =  ObjectMgr::GetCreatureTemplateAddon(GetCreatureInfo()->Entry))
+            return addon;
+    }
+
+    // Return CreatureTemplateAddon when nothing else exist
+    return ObjectMgr::GetCreatureTemplateAddon(GetEntry());
 }
 
 //creature_addon table
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index b9bce87af..6437b27a8 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 "11375"
+ #define REVISION_NR "11376"
 #endif // __REVISION_NR_H__