diff --git a/package.json b/package.json
index c02a4cc6..87f92462 100644
--- a/package.json
+++ b/package.json
@@ -98,7 +98,7 @@
     ]
   },
   "resolutions": {
-    "@sendbird/chat": "4.16.0",
+    "@sendbird/chat": "4.16.5",
     "@types/react": "^18"
   }
 }
diff --git a/packages/uikit-react-native/src/hooks/useMentionTextInput.ts b/packages/uikit-react-native/src/hooks/useMentionTextInput.ts
index 50bce94b..22c98be5 100644
--- a/packages/uikit-react-native/src/hooks/useMentionTextInput.ts
+++ b/packages/uikit-react-native/src/hooks/useMentionTextInput.ts
@@ -26,7 +26,9 @@ const useMentionTextInput = (params: { messageToEdit?: SendbirdUserMessage | Sen
       )
     ) {
       const result = mentionManager.templateToTextAndMentionedUsers(
-        params.messageToEdit?.mentionedMessageTemplate ?? '',
+        params.messageToEdit && 'mentionedMessageTemplate' in params.messageToEdit
+          ? params.messageToEdit.mentionedMessageTemplate ?? ''
+          : '',
         params.messageToEdit?.mentionedUsers ?? [],
       );
 
diff --git a/packages/uikit-react-native/src/libs/MentionManager.tsx b/packages/uikit-react-native/src/libs/MentionManager.tsx
index 2c187504..58ac28d4 100644
--- a/packages/uikit-react-native/src/libs/MentionManager.tsx
+++ b/packages/uikit-react-native/src/libs/MentionManager.tsx
@@ -246,9 +246,11 @@ class MentionManager {
   ): boolean => {
     return Boolean(
       mentionEnabled &&
-        message?.mentionedMessageTemplate &&
-        message?.mentionedUsers &&
-        message?.mentionedUsers.length > 0,
+        message &&
+        'mentionedMessageTemplate' in message &&
+        message.mentionedMessageTemplate &&
+        message.mentionedUsers &&
+        message.mentionedUsers.length > 0,
     );
   };
 }
diff --git a/yarn.lock b/yarn.lock
index b7df2c01..29de7185 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3703,10 +3703,10 @@
     mkdirp "^1.0.4"
     rimraf "^3.0.2"
 
-"@sendbird/chat@4.16.0", "@sendbird/chat@^4.16.0":
-  version "4.16.0"
-  resolved "https://registry.yarnpkg.com/@sendbird/chat/-/chat-4.16.0.tgz#3a133fb415735261fa5f6ef3fb646af99394c76e"
-  integrity sha512-Fe6CkQpviXhWjvrglq8ZVNfaFFVkh8wrKSErecbPz7nThqw6JzAx1nD1i1efpu0+ARid9dyuxmxYLAPWw4OAIg==
+"@sendbird/chat@4.16.5", "@sendbird/chat@^4.16.0":
+  version "4.16.5"
+  resolved "https://registry.yarnpkg.com/@sendbird/chat/-/chat-4.16.5.tgz#ece60f33fed480028da79a142a75a3a5cef9a91a"
+  integrity sha512-fB3SgfF5mxpqOMD6Ah0anWN7wlgHyWVcGacVcX5K0pEj8K81wHCubmRNH622VDmuTnXWAU97mMZTXsEfO3YqXA==
 
 "@sendbird/uikit-tools@0.0.1-alpha.77":
   version "0.0.1-alpha.77"