diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 9c66731b06..85b4b52380 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -313,7 +313,7 @@ module.exports = React.createClass({
         const newOrder = {};
 
         // Is the tag ordered manually?
-        if (!newTag.match(/^(m\.lowpriority|im\.vector\.fake\.(invite|recent|direct|archived))$/)) {
+        if (newTag && !newTag.match(/^(m\.lowpriority|im\.vector\.fake\.(invite|recent|direct|archived))$/)) {
             const newList = Object.assign({}, this.state.lists[newTag]);
 
             // If the room was moved "down" (increasing index) in the same list we