diff --git a/src/pages/inbox/components/DirectMessageButton/components/DirectMessageModal/hooks/useDMUsers.ts b/src/pages/inbox/components/DirectMessageButton/components/DirectMessageModal/hooks/useDMUsers.ts
index dfba80807..93a621229 100644
--- a/src/pages/inbox/components/DirectMessageButton/components/DirectMessageModal/hooks/useDMUsers.ts
+++ b/src/pages/inbox/components/DirectMessageButton/components/DirectMessageModal/hooks/useDMUsers.ts
@@ -47,7 +47,7 @@ export const useDMUsers = (): Return => {
         }
       }
     },
-    [state, userId],
+    [state.loading, state.fetched, userId],
   );
 
 
diff --git a/src/shared/components/Chat/ChatMessage/ChatMessage.tsx b/src/shared/components/Chat/ChatMessage/ChatMessage.tsx
index de26a0f85..ad9f1ce57 100644
--- a/src/shared/components/Chat/ChatMessage/ChatMessage.tsx
+++ b/src/shared/components/Chat/ChatMessage/ChatMessage.tsx
@@ -253,12 +253,12 @@ const ChatMessage = ({
         isProposalMessage: chatType === ChatType.ProposalComments,
         discussionId: discussionMessage.discussionId,
         callback(isSucceed) {
+          setIsMessageEditLoading(false);
           if (isSucceed) {
             handleEditModeClose();
           } else {
             notify("Something went wrong");
           }
-          setIsMessageEditLoading(false);
         },
       }),
     );
@@ -409,18 +409,25 @@ const ChatMessage = ({
     return null;
   }
 
-  const emojiButton = (
-    <ReactWithEmoji
-      emojiButtonClassName={styles.emojiButton}
-      discussionId={discussionMessage.discussionId}
-      discussionMessageId={discussionMessage.id}
-      className={
-        isNotCurrentUserMessage
-          ? styles.reactWithEmoji
-          : styles.reactWithEmojiSelf
-      }
-      isNotCurrentUserMessage={isNotCurrentUserMessage}
-    />
+  const emojiButton = useCallback(
+    () => (
+      <ReactWithEmoji
+        emojiButtonClassName={styles.emojiButton}
+        discussionId={discussionMessage.discussionId}
+        discussionMessageId={discussionMessage.id}
+        className={
+          isNotCurrentUserMessage
+            ? styles.reactWithEmoji
+            : styles.reactWithEmojiSelf
+        }
+        isNotCurrentUserMessage={isNotCurrentUserMessage}
+      />
+    ),
+    [
+      discussionMessage.discussionId,
+      discussionMessage.id,
+      isNotCurrentUserMessage,
+    ],
   );
 
   return (