diff --git a/Libraries/Core/Helpers/QuestHelper.cs b/Libraries/Core/Helpers/QuestHelper.cs
index 14c4a484..3b97e1b6 100644
--- a/Libraries/Core/Helpers/QuestHelper.cs
+++ b/Libraries/Core/Helpers/QuestHelper.cs
@@ -1121,7 +1121,7 @@ public class QuestHelper(
             }
         }
 
-        return questsToShowPlayer;
+        return UpdateQuestsForGameEdition(questsToShowPlayer, profile.Info.GameVersion);
     }
 
     /**
@@ -1141,6 +1141,9 @@ public class QuestHelper(
             var propsAsDict = quest.Rewards.GetAllPropsAsDict<List<Reward>>();
             foreach (var rewardType in propsAsDict)
             {
+                if (rewardType.Value is null)
+                    continue;
+                
                 propsAsDict[rewardType.Key] = propsAsDict[rewardType.Key]
                     .Where(
                         reward =>
diff --git a/Libraries/Core/Models/Eft/Common/Tables/Reward.cs b/Libraries/Core/Models/Eft/Common/Tables/Reward.cs
index 0993d578..e593b0e4 100644
--- a/Libraries/Core/Models/Eft/Common/Tables/Reward.cs
+++ b/Libraries/Core/Models/Eft/Common/Tables/Reward.cs
@@ -12,6 +12,7 @@ public record Reward
     public string? Id { get; set; }
     
     [JsonPropertyName("type")]
+    [JsonConverter(typeof(JsonStringEnumConverter))]
     public RewardType? Type { get; set; }
 
     [JsonPropertyName("index")]
diff --git a/Libraries/Core/Utils/JsonUtil.cs b/Libraries/Core/Utils/JsonUtil.cs
index 27580508..e69bef53 100644
--- a/Libraries/Core/Utils/JsonUtil.cs
+++ b/Libraries/Core/Utils/JsonUtil.cs
@@ -32,6 +32,7 @@ public class JsonUtil
             new EftEnumConverter<BonusSkillType>(),
             new EftEnumConverter<NotificationEventType>(),
             new EftEnumConverter<QuestTypeEnum>(),
+            new EftEnumConverter<RewardType>(),
             new BaseInteractionRequestDataConverter()
         }
     };