diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index 2740c6a400..092ed9cca0 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -530,7 +530,7 @@ var RoomSubList = React.createClass({
         var label = this.props.collapsed ? null : this.props.label;
 
         let content;
-        if (this.state.sortedList.length == 0) {
+        if (this.state.sortedList.length == 0 && !this.props.searchFilter) {
             content = this.props.emptyContent;
         } else {
             content = this.makeRoomTiles();