diff --git a/Source/Game/Globals/ObjectAccessor.cs b/Source/Game/Globals/ObjectAccessor.cs
index f3f1cf5c5..9e1c542d7 100644
--- a/Source/Game/Globals/ObjectAccessor.cs
+++ b/Source/Game/Globals/ObjectAccessor.cs
@@ -88,6 +88,8 @@ public class ObjectAccessor : Singleton<ObjectAccessor>
                     return GetConversation(p, guid);
                 break;
             case HighGuid.Corpse:
+                if (typemask.HasAnyFlag(TypeMask.Corpse))
+                    return GetCorpse(p, guid);
                 break;
         }
 
@@ -123,7 +125,7 @@ public class ObjectAccessor : Singleton<ObjectAccessor>
     {
         return u.GetMap().GetSceneObject(guid);
     }
-    
+
     public static Conversation GetConversation(WorldObject u, ObjectGuid guid)
     {
         return u.GetMap().GetConversation(guid);