diff --git a/src/server/game/Entities/Item/ItemTemplate.h b/src/server/game/Entities/Item/ItemTemplate.h
index 1550b3883..29831d235 100644
--- a/src/server/game/Entities/Item/ItemTemplate.h
+++ b/src/server/game/Entities/Item/ItemTemplate.h
@@ -700,8 +700,7 @@ struct ItemTemplate
         return GetMaxStackSize() == 1 &&
                Class != ITEM_CLASS_CONSUMABLE &&
                Class != ITEM_CLASS_QUEST &&
-               !HasFlag(ITEM_FLAG_NO_CREATOR) &&
-               ItemId != 6948; /*Hearthstone*/
+               !HasFlag(ITEM_FLAG_NO_CREATOR);
     }
 
     [[nodiscard]] bool CanChangeEquipStateInCombat() const
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp
index d176f869b..74a1a1bba 100644
--- a/src/server/game/Spells/SpellEffects.cpp
+++ b/src/server/game/Spells/SpellEffects.cpp
@@ -1759,7 +1759,7 @@ void Spell::DoCreateItem(uint8 /*effIndex*/, uint32 itemId)
         }
 
         // set the "Crafted by ..." property of the item
-        if (pItem->GetTemplate()->HasSignature())
+        if (m_caster->IsPlayer() && pItem->GetTemplate()->HasSignature())
             pItem->SetGuidValue(ITEM_FIELD_CREATOR, player->GetGUID());
 
         // send info to the client