diff --git a/Source/Game/Entities/Creature/Gossip.cs b/Source/Game/Entities/Creature/Gossip.cs
index 260c76b7c..1783161f1 100644
--- a/Source/Game/Entities/Creature/Gossip.cs
+++ b/Source/Game/Entities/Creature/Gossip.cs
@@ -529,7 +529,7 @@ namespace Game.Misc
             offer.SuggestedPartyMembers = quest.SuggestedPlayers;
 
             for (uint i = 0; i < SharedConst.QuestEmoteCount && quest.OfferRewardEmote[i] != 0; ++i)
-                offer.Emotes.Add(new QuestDescEmote(quest.OfferRewardEmote[i], quest.OfferRewardEmoteDelay[i]));
+                offer.Emotes.Add(new QuestDescEmote((uint)quest.OfferRewardEmote[i], quest.OfferRewardEmoteDelay[i]));
 
             offer.QuestFlags[0] = (uint)quest.Flags;
             offer.QuestFlags[1] = (uint)quest.FlagsEx;
diff --git a/Source/Game/Quest/Quest.cs b/Source/Game/Quest/Quest.cs
index 5e1d29c28..b72349a80 100644
--- a/Source/Game/Quest/Quest.cs
+++ b/Source/Game/Quest/Quest.cs
@@ -195,7 +195,7 @@ namespace Game
         {
             for (int i = 0; i < SharedConst.QuestEmoteCount; ++i)
             {
-                ushort emoteId = fields.Read<ushort>(1 + i);
+                short emoteId = fields.Read<short>(1 + i);
                 if (!CliDB.EmotesStorage.ContainsKey(emoteId))
                 {
                     Log.outError(LogFilter.Sql, "Table `quest_offer_reward` has non-existing Emote{0} ({1}) set for quest {2}. Skipped.", 1 + i, emoteId, fields.Read<uint>(0));
@@ -756,7 +756,7 @@ namespace Game
         public string RequestItemsText = "";
 
         // quest_offer_reward table
-        public uint[] OfferRewardEmote = new uint[SharedConst.QuestEmoteCount];
+        public int[] OfferRewardEmote = new int[SharedConst.QuestEmoteCount];
         public uint[] OfferRewardEmoteDelay = new uint[SharedConst.QuestEmoteCount];
         public string OfferRewardText = "";