diff --git a/config.json b/config.json
index 923d23ab2c..9834209ae7 100644
--- a/config.json
+++ b/config.json
@@ -1,4 +1,4 @@
 {
-    "default_hs_url": "https://matrix.org",
+    "default_hs_url": "http://localhost:8008",
     "default_is_url": "https://vector.im"
 }
diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index 903e8586fa..4ce5cff17c 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -255,7 +255,7 @@ var RoomSubList = React.createClass({
                     collapsed={ self.props.collapsed || false}
                     selected={ selected }
                     unread={ self.props.activityMap[room.roomId] === 1 }
-                    highlight={ (room.unread_notifications && room.unread_notifications['notification_count'] > 0) || self.props.label === 'Invites' }
+                    highlight={ room.getUnreadNotificationCount('highlight') > 0 || self.props.label === 'Invites' }
                     isInvite={ self.props.label === 'Invites' }
                     incomingCall={ self.props.incomingCall && (self.props.incomingCall.roomId === room.roomId) ? self.props.incomingCall : null }
                      />