diff --git a/src/services/missionInventoryUpdateService.ts b/src/services/missionInventoryUpdateService.ts
index 2a9dda9a..cfa7d8d4 100644
--- a/src/services/missionInventoryUpdateService.ts
+++ b/src/services/missionInventoryUpdateService.ts
@@ -721,16 +721,14 @@ export const addMissionRewards = async (
         }
     }
 
-    if (rewardInfo.JobStage != undefined && rewardInfo.jobId) {
+    if (rewardInfo.JobStage != undefined && rewardInfo.jobId && rewardInfo.JobTier! >= 0) {
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        const [jobType, tierStr, hubNode, syndicateId, locationTag] = rewardInfo.jobId.split("_");
-        const tier = Number(tierStr);
-
+        const [jobType, unkIndex, hubNode, syndicateId, locationTag] = rewardInfo.jobId.split("_");
         const worldState = getWorldState();
         let syndicateEntry = worldState.SyndicateMissions.find(m => m._id.$oid === syndicateId);
         if (!syndicateEntry) syndicateEntry = worldState.SyndicateMissions.find(m => m.Tag === syndicateId); // Sometimes syndicateId can be tag
         if (syndicateEntry && syndicateEntry.Jobs) {
-            let currentJob = syndicateEntry.Jobs[tier];
+            let currentJob = syndicateEntry.Jobs[rewardInfo.JobTier!];
             if (syndicateEntry.Tag === "EntratiSyndicate") {
                 const vault = syndicateEntry.Jobs.find(j => j.locationTag === locationTag);
                 if (vault) currentJob = vault;
@@ -925,10 +923,9 @@ function getRandomMissionDrops(RewardInfo: IRewardInfo, tierOverride: number | u
 
         let rotations: number[] = [];
         if (RewardInfo.jobId) {
-            if (RewardInfo.JobStage! >= 0) {
+            if (RewardInfo.JobTier! >= 0 && RewardInfo.JobStage! >= 0) {
                 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-                const [jobType, tierStr, hubNode, syndicateId, locationTag] = RewardInfo.jobId.split("_");
-                const tier = Number(tierStr);
+                const [jobType, unkIndex, hubNode, syndicateId, locationTag] = RewardInfo.jobId.split("_");
                 let isEndlessJob = false;
                 if (syndicateId) {
                     const worldState = getWorldState();
@@ -936,7 +933,7 @@ function getRandomMissionDrops(RewardInfo: IRewardInfo, tierOverride: number | u
                     if (!syndicateEntry) syndicateEntry = worldState.SyndicateMissions.find(m => m.Tag === syndicateId);
 
                     if (syndicateEntry && syndicateEntry.Jobs) {
-                        let job = syndicateEntry.Jobs[tier];
+                        let job = syndicateEntry.Jobs[RewardInfo.JobTier!];
 
                         if (syndicateEntry.Tag === "EntratiSyndicate") {
                             const vault = syndicateEntry.Jobs.find(j => j.locationTag === locationTag);