diff --git a/src/app/organisms/emoji-board/EmojiBoard.jsx b/src/app/organisms/emoji-board/EmojiBoard.jsx
index 3f473e4b..2cdef537 100644
--- a/src/app/organisms/emoji-board/EmojiBoard.jsx
+++ b/src/app/organisms/emoji-board/EmojiBoard.jsx
@@ -87,10 +87,10 @@ function SearchedEmoji() {
   function handleSearchEmoji(resultEmojis, term) {
     if (term === '' || resultEmojis.length === 0) {
       if (term === '') setSearchedEmojis(null);
-      else setSearchedEmojis([]);
+      else setSearchedEmojis({ emojis: [] });
       return;
     }
-    setSearchedEmojis(resultEmojis);
+    setSearchedEmojis({ emojis: resultEmojis });
   }
 
   useEffect(() => {
@@ -102,7 +102,7 @@ function SearchedEmoji() {
 
   if (searchedEmojis === null) return false;
 
-  return <EmojiGroup key="-1" name={searchedEmojis.length === 0 ? 'No search result found' : 'Search results'} groupEmojis={searchedEmojis} />;
+  return <EmojiGroup key="-1" name={searchedEmojis.emojis.length === 0 ? 'No search result found' : 'Search results'} groupEmojis={searchedEmojis.emojis} />;
 }
 
 function EmojiBoard({ onSelect }) {
diff --git a/src/app/organisms/room/PeopleDrawer.jsx b/src/app/organisms/room/PeopleDrawer.jsx
index dcddc76d..dc580157 100644
--- a/src/app/organisms/room/PeopleDrawer.jsx
+++ b/src/app/organisms/room/PeopleDrawer.jsx
@@ -149,7 +149,7 @@ function PeopleDrawer({ roomId }) {
               }
               <div className="people-drawer__load-more">
                 {
-                  mList.length !== 0 && mList.length > itemCount && (
+                  mList.length !== 0 && memberList.length > itemCount && (
                     <Button onClick={loadMorePeople}>View more</Button>
                   )
                 }