diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index 68e21cec..a69f3652 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @baseapp-frontend/components
 
+## 0.0.48
+
+### Patch Changes
+
+- Chatroom search fixed
+
 ## 0.0.47
 
 ### Patch Changes
diff --git a/packages/components/modules/messages/ChatRoomsList/index.tsx b/packages/components/modules/messages/ChatRoomsList/index.tsx
index 197ae5aa..b536d126 100644
--- a/packages/components/modules/messages/ChatRoomsList/index.tsx
+++ b/packages/components/modules/messages/ChatRoomsList/index.tsx
@@ -40,18 +40,27 @@ const ChatRoomsList: FC<ChatRoomsListProps> = ({
 
   const isInUnreadTab = tab === CHAT_TAB_VALUES.unread
   const isInArchivedTab = tab === CHAT_TAB_VALUES.archived
+  const searchValue = watch('search')
 
   const handleSearchChange: ChangeEventHandler<HTMLInputElement> = (e) => {
     const value = e.target.value || ''
     startTransition(() => {
-      refetch({ q: value })
+      refetch({
+        q: value,
+        unreadMessages: isInUnreadTab,
+        archived: isInArchivedTab,
+      })
     })
   }
 
   const handleSearchClear = () => {
     startTransition(() => {
       reset()
-      refetch({ q: '' })
+      refetch({
+        q: '',
+        unreadMessages: isInUnreadTab,
+        archived: isInArchivedTab,
+      })
     })
   }
 
@@ -60,6 +69,7 @@ const ChatRoomsList: FC<ChatRoomsListProps> = ({
     startRefetchTransition(() => {
       refetch(
         {
+          q: searchValue,
           unreadMessages: newTab === CHAT_TAB_VALUES.unread,
           archived: newTab === CHAT_TAB_VALUES.archived,
         },
@@ -119,7 +129,6 @@ const ChatRoomsList: FC<ChatRoomsListProps> = ({
 
   const renderListContent = () => {
     const emptyChatRoomsList = chatRooms.length === 0
-    const searchValue = watch('search')
 
     if (!isPending && searchValue && emptyChatRoomsList) return <SearchNotFoundState />
 
@@ -156,6 +165,11 @@ const ChatRoomsList: FC<ChatRoomsListProps> = ({
         }}
       >
         <Searchbar
+          key={
+            tab /* The handleSearchChange function depends on tab.
+            Searchbar calls useRef on the onChange function (to debounce),
+            hence it does not see the changes unless it is reloaded */
+          }
           name="search"
           control={control}
           onChange={handleSearchChange}
diff --git a/packages/components/package.json b/packages/components/package.json
index de454ede..fc189a56 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@baseapp-frontend/components",
   "description": "BaseApp components modules such as comments, notifications, messages, and more.",
-  "version": "0.0.47",
+  "version": "0.0.48",
   "main": "./index.ts",
   "types": "dist/index.d.ts",
   "sideEffects": false,