diff --git a/apps/portal/src/pages/questions/[questionId]/[questionSlug]/answer/[answerId]/[answerSlug]/index.tsx b/apps/portal/src/pages/questions/[questionId]/[questionSlug]/answer/[answerId]/[answerSlug]/index.tsx
index 8d8e84e2..0804f60e 100644
--- a/apps/portal/src/pages/questions/[questionId]/[questionSlug]/answer/[answerId]/[answerSlug]/index.tsx
+++ b/apps/portal/src/pages/questions/[questionId]/[questionSlug]/answer/[answerId]/[answerSlug]/index.tsx
@@ -86,7 +86,7 @@ export default function QuestionPage() {
             authorName={answer.user}
             content={answer.content}
             createdAt={answer.createdAt}
-            upvoteCount={0}
+            upvoteCount={answer.numVotes}
           />
           <div className="mx-2">
             <form
diff --git a/apps/portal/src/utils/questions/useVote.ts b/apps/portal/src/utils/questions/useVote.ts
index e9ae6466..6247f187 100644
--- a/apps/portal/src/utils/questions/useVote.ts
+++ b/apps/portal/src/utils/questions/useVote.ts
@@ -124,7 +124,16 @@ export const useVote = <VoteQueryKey extends QueryKey = QueryKey>(
   const utils = trpc.useContext();
 
   const onVoteUpdate = useCallback(() => {
+    // TODO: Optimise query invalidation
     utils.invalidateQueries([query, { [idKey]: id } as any]);
+    utils.invalidateQueries(['questions.questions.getQuestionsByFilter']);
+    utils.invalidateQueries(['questions.questions.getQuestionById']);
+    utils.invalidateQueries(['questions.answers.getAnswers']);
+    utils.invalidateQueries(['questions.answers.getAnswerById']);
+    utils.invalidateQueries([
+      'questions.questions.comments.getQuestionComments',
+    ]);
+    utils.invalidateQueries(['questions.answers.comments.getAnswerComments']);
   }, [id, idKey, utils, query]);
 
   const { data } = trpc.useQuery([