diff --git a/src/components/CommunityChat/Reaction/index.jsx b/src/components/CommunityChat/Reaction/index.jsx
index 85013214b..5a72a3951 100644
--- a/src/components/CommunityChat/Reaction/index.jsx
+++ b/src/components/CommunityChat/Reaction/index.jsx
@@ -6,7 +6,7 @@ import { db } from "../../../lib/firebase";
 import { useSnackbar } from "notistack";
 import { useState } from "react";
 
-const Reaction = ({ message, userUid }) => {
+const Reaction = ({ message, userUid, currentUid }) => {
   const [reactionOpen, setReactionOpen] = useState(false);
   const { id, reaction } = message;
   const { enqueueSnackbar } = useSnackbar();
@@ -26,53 +26,47 @@ const Reaction = ({ message, userUid }) => {
   }
 
   async function addReaction(type) {
-    let updatedData = reaction;
+    let updatedData = { ...reaction }; // Create a copy of the existing reactions
     const msgDocRef = db.collection("messages").doc(id);
-
-    if (!updatedData) {
-      updatedData = {
-        [type]: [userUid],
-      };
-    } else {
-      const rxnUser = checkOccurenceOfReaction();
-      if (rxnUser) {
-        const rxnIdx = reaction[rxnUser].indexOf(userUid);
-        updatedData[rxnUser].splice(rxnIdx, 1);
-        if (rxnUser !== type) {
-          if (updatedData[type]) {
-            updatedData[type].push(userUid);
-          } else {
-            updatedData = {
-              ...updatedData,
-              [rxnUser]: [userUid],
-            };
-          }
-        }
+  
+    if (updatedData[type]) {
+      // Check if the user has already reacted with this emoji
+      const userIndex = updatedData[type].indexOf(currentUid);
+  
+      if (userIndex !== -1) {
+        // If the user's reaction already exists, remove it
+        updatedData[type].splice(userIndex, 1);
       } else {
-        if (updatedData[type]) {
-          updatedData[type].push(userUid);
-        } else {
-          updatedData = {
-            ...updatedData,
-            [type]: [userUid],
-          };
+        // If the user's reaction doesn't exist, toggle off any existing reaction
+        for (const existingType in updatedData) {
+          const existingUserIndex = updatedData[existingType].indexOf(currentUid);
+          if (existingUserIndex !== -1) {
+            updatedData[existingType].splice(existingUserIndex, 1);
+            break; // Exit the loop after toggling off the existing reaction
+          }
         }
+        
+        updatedData[type].push(currentUid); // Add the new reaction
       }
+    } else {
+      // If the reaction type doesn't exist, create a new array with the user's UID
+      updatedData[type] = [currentUid];
     }
-
-    msgDocRef
-      .update({
+  
+    // Update the reaction data in the message document
+    try {
+      await msgDocRef.update({
         reaction: updatedData,
-      })
-      .catch((e) => {
-        enqueueSnackbar("Error while reacting", {
-          variant: "error",
-        });
       });
-
-    setReactionOpen(false);
+      setReactionOpen(false);
+    } catch (error) {
+      enqueueSnackbar("Error while reacting", {
+        variant: "error",
+      });
+    }
   }
 
+
   return (
     <ClickAwayListener onClickAway={() => setReactionOpen(false)}>
       <div className="flex-center">
diff --git a/src/components/CommunityChat/index.css b/src/components/CommunityChat/index.css
index 8f8fa8ca0..c207f6afe 100644
--- a/src/components/CommunityChat/index.css
+++ b/src/components/CommunityChat/index.css
@@ -166,7 +166,9 @@
   position: absolute;
   padding: 0;
   bottom: -13px;
-  right: 0;
+  left: 12px;
+  display: flex;
+  gap: 8px;
 }
 
 .rxn-container {
diff --git a/src/components/CommunityChat/index.jsx b/src/components/CommunityChat/index.jsx
index e5a9c67ee..a5265c2f4 100644
--- a/src/components/CommunityChat/index.jsx
+++ b/src/components/CommunityChat/index.jsx
@@ -309,7 +309,7 @@ const ChatBox = () => {
                         <h6 className="message-time">
                           {getTime(message?.createdAt?.seconds)}
                         </h6>
-                        <Reaction message={message} userUid={message.uid} />
+                        <Reaction message={message} userUid={message.uid} currentUid={user.uid} />
                         {user.uid === message.uid && (
                           <span className="flex-center message-options">
                             <OptionIcon
@@ -414,4 +414,4 @@ const ChatBox = () => {
   );
 };
 
-export default ChatBox;
+export default ChatBox;
\ No newline at end of file