diff --git a/src/app/molecules/room-search/RoomSearch.jsx b/src/app/molecules/room-search/RoomSearch.jsx
index 39b83b4..3a86cbe 100644
--- a/src/app/molecules/room-search/RoomSearch.jsx
+++ b/src/app/molecules/room-search/RoomSearch.jsx
@@ -109,8 +109,8 @@ function RoomSearch({ roomId }) {
   const searchTerm = searchData?._query.search_categories.room_events.search_term ?? '';
 
   const handleSearch = (e) => {
-    if (isRoomEncrypted) return;
     e.preventDefault();
+    if (isRoomEncrypted) return;
     const searchTermInput = e.target.elements['room-search-input'];
     const term = searchTermInput.value.trim();
 
@@ -144,6 +144,7 @@ function RoomSearch({ roomId }) {
           <Input
             placeholder="Search for keywords"
             name="room-search-input"
+            disabled={isRoomEncrypted}
           />
           <Button iconSrc={SearchIC} variant="primary" type="submit">Search</Button>
         </div>