diff --git a/src/app/organisms/public-rooms/PublicRooms.jsx b/src/app/organisms/public-rooms/PublicRooms.jsx
index b8f9244..b7d2dbb 100644
--- a/src/app/organisms/public-rooms/PublicRooms.jsx
+++ b/src/app/organisms/public-rooms/PublicRooms.jsx
@@ -137,7 +137,7 @@ function PublicRooms({ isOpen, searchTerm, onRequestClose }) {
       updateNextBatch(result.next_batch);
       updateIsSearching(false);
       updateIsViewMore(false);
-      if (totalRooms.length === 0) {
+      if (totalRooms.length === 0 && inputRoomName !== '') {
         updateSearchQuery({
           error: `No result found for "${inputRoomName}" on ${inputHs}`,
           alias: isInputAlias ? inputRoomName : null,
@@ -241,12 +241,20 @@ function PublicRooms({ isOpen, searchTerm, onRequestClose }) {
             )
           }
           {
-            typeof searchQuery.name !== 'undefined' && !isSearching && (
+            typeof searchQuery.name !== 'undefined' && !isSearching && publicRooms.length !== 0 && (
               searchQuery.name === ''
                 ? <Text variant="b2">{`Public rooms on ${searchQuery.homeserver}.`}</Text>
                 : <Text variant="b2">{`Search result for "${searchQuery.name}" on ${searchQuery.homeserver}.`}</Text>
             )
           }
+          {
+             typeof searchQuery.name !== 'undefined' && !isSearching && publicRooms.length === 0
+              && (
+              <div className="flex--center">
+                <Text variant="b2">{`There are no public rooms on ${searchQuery.homeserver}.`}</Text>
+              </div>
+              )
+          }
           { searchQuery.error && (
             <>
               <Text className="public-rooms__search-error" variant="b2">{searchQuery.error}</Text>