diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 83e1a4336..0e055b1da 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -647,7 +647,9 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa
             if(!cVictim->isPet())
             {
                 cVictim->DeleteThreatList();
-                cVictim->SetUInt32Value(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
+                // only lootable if it has loot or can drop gold
+                if(cVictim->GetCreatureInfo()->lootid || cVictim->GetCreatureInfo()->maxgold > 0)
+                    cVictim->SetUInt32Value(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
             }
             // Call creature just died function
             if (cVictim->AI())
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index bcb5b939d..c2188696b 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 "8284"
+ #define REVISION_NR "8285"
 #endif // __REVISION_NR_H__