diff --git a/src/lib/components/CommentSection.svelte b/src/lib/components/CommentSection.svelte
index 359858df..71bafec5 100644
--- a/src/lib/components/CommentSection.svelte
+++ b/src/lib/components/CommentSection.svelte
@@ -94,9 +94,10 @@ const handleUpvote = async (event) => {
       
   const commentId = event.target.commentId.value;
   const postData = {
-                  'commentId': commentId,
-                  'userId': data?.user?.id,
-                  };
+      'postId': postId,
+      'commentId': commentId,
+      'userId': data?.user?.id,
+  };
         
   upvoteButtonClicked = !upvoteButtonClicked;
   
diff --git a/src/routes/community/post/[postId]/+page.svelte b/src/routes/community/post/[postId]/+page.svelte
index 98748570..1b186bcb 100644
--- a/src/routes/community/post/[postId]/+page.svelte
+++ b/src/routes/community/post/[postId]/+page.svelte
@@ -42,18 +42,6 @@ let upvoteCounter = {};
 let downvoteCounter = {};
 let userAlreadyVoted;
 
-upvoteCounter[post.id] = post?.upvote;
-downvoteCounter[post.id] = post?.downvote;
-userAlreadyVoted = post?.expand['alreadyVoted(post)']?.some(item => item?.user === data?.user?.id);
-  
-if (userAlreadyVoted) {
-  upvoteButtonClicked[post.id] = post?.expand['alreadyVoted(post)']?.find(item => item?.user === data?.user?.id)?.type === 'upvote';
-  downvoteButtonClicked[post.id] = post?.expand['alreadyVoted(post)']?.find(item => item?.user === data?.user?.id)?.type === 'downvote';
-} else {
-  upvoteButtonClicked[post.id] = false;
-  downvoteButtonClicked[post.id] = false;
-}
-
 
 
 const handleUpvote = async (event) => {
@@ -293,6 +281,20 @@ let LoginPopup;
 
 onMount(async () => {
     
+  upvoteCounter[post.id] = post?.upvote;
+  downvoteCounter[post.id] = post?.downvote;
+  userAlreadyVoted = post?.expand['alreadyVoted(post)']?.some(item => item?.user === data?.user?.id);
+    
+  if (userAlreadyVoted) {
+    upvoteButtonClicked[post.id] = post?.expand['alreadyVoted(post)']?.find(item => item?.user === data?.user?.id)?.type === 'upvote';
+    downvoteButtonClicked[post.id] = post?.expand['alreadyVoted(post)']?.find(item => item?.user === data?.user?.id)?.type === 'downvote';
+  } else {
+    upvoteButtonClicked[post.id] = false;
+    downvoteButtonClicked[post.id] = false;
+  }
+
+
+
     if(!data?.user)
     {
       LoginPopup = (await import('$lib/components/LoginPopup.svelte')).default;
diff --git a/src/routes/notifications/+page.svelte b/src/routes/notifications/+page.svelte
index ddfe7436..981d7e89 100644
--- a/src/routes/notifications/+page.svelte
+++ b/src/routes/notifications/+page.svelte
@@ -157,7 +157,7 @@ onMount(async () => {
                    {item?.expand?.user?.username}
                  </label>
                  <span class="text-white text-xs sm:text-sm">
-                  upvoted your post
+                  upvoted your {item?.comment ? 'comment' : 'post'}
                  </span>
                 </div>
                 <span class="text-xs sm:text-sm text-[#A6ADBB0">{formatDate(item?.created)} ago</span>