diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
index 6f65c39fb..c05a324f6 100644
--- a/src/game/ObjectMgr.cpp
+++ b/src/game/ObjectMgr.cpp
@@ -7366,6 +7366,8 @@ void ObjectMgr::LoadTrainerSpell()
 
     barGoLink bar( result->GetRowCount() );
 
+    std::set<uint32> talentIds;
+
     uint32 count = 0;
     do
     {
@@ -7407,6 +7409,16 @@ void ObjectMgr::LoadTrainerSpell()
             continue;
         }
 
+        if(GetTalentSpellCost(spell))
+        {
+            if(talentIds.count(spell)==0)
+            {
+                sLog.outErrorDb("Table `npc_trainer` has talent as learning spell %u, ignore", spell);
+                talentIds.insert(spell);
+            }
+            continue;
+        }
+
         TrainerSpellData& data = m_mCacheTrainerSpellMap[entry];
 
         TrainerSpell& trainerSpell = data.spellList[spell];
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 209306e4e..731249243 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 "8038"
+ #define REVISION_NR "8039"
 #endif // __REVISION_NR_H__