diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 98a5229d6a..216dd972cf 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -540,6 +540,10 @@ module.exports = React.createClass({
             }
         }
 
+        if (this.state.totalRoomCount === 0) {
+            return null;
+        }
+
         const labelText = 'Drop here to ' + (VERBS[section] || 'tag ' + section);
 
         return <RoomDropTarget label={labelText} />;