diff --git a/api/src/utils/common-challenge-functions.ts b/api/src/utils/common-challenge-functions.ts
index dcf80df569c..df85e8dd8a2 100644
--- a/api/src/utils/common-challenge-functions.ts
+++ b/api/src/utils/common-challenge-functions.ts
@@ -124,15 +124,12 @@ export async function updateUserChallengeData(
     : null;
 
   if (alreadyCompleted && oldChallenge) {
-    const challengeWithOldDate = userCompletedChallenges[oldIndex];
+    finalChallenge = {
+      ...completedChallenge,
+      completedDate: oldChallenge.completedDate
+    };
 
-    if (challengeWithOldDate) {
-      challengeWithOldDate.completedDate = oldChallenge.completedDate;
-      finalChallenge = {
-        ...completedChallenge,
-        ...challengeWithOldDate
-      };
-    }
+    userCompletedChallenges[oldIndex] = finalChallenge;
   } else {
     finalChallenge = {
       ...completedChallenge