diff --git a/apps/portal/src/server/router/resumes/resumes-comments-votes-router.ts b/apps/portal/src/server/router/resumes/resumes-comments-votes-router.ts
index 5d508c35..e5148a81 100644
--- a/apps/portal/src/server/router/resumes/resumes-comments-votes-router.ts
+++ b/apps/portal/src/server/router/resumes/resumes-comments-votes-router.ts
@@ -20,13 +20,13 @@ export const resumesCommentsVotesRouter = createRouter().query('list', {
       },
     });
 
-    let userVote: ResumesCommentVote | null = null;
-    let numVotes = 0;
-
-    votes.forEach((vote) => {
-      numVotes += vote.value === Vote.UPVOTE ? 1 : -1;
-      userVote = vote.userId === userId ? vote : null;
-    });
+    const userVotes = votes.filter((vote) => vote.userId === userId);
+    const userVote = userVotes.length > 0 ? userVotes[0] : null;
+    const numVotes = votes
+      .map((vote) => (vote.value === Vote.UPVOTE ? 1 : -1))
+      .reduce((result, current) => {
+        return result + current;
+      }, 0);
 
     const resumeCommentVote: ResumeCommentVote = {
       numVotes,