diff --git a/src/components/RoomList.vue b/src/components/RoomList.vue
index a21f624..b78de3a 100644
--- a/src/components/RoomList.vue
+++ b/src/components/RoomList.vue
@@ -52,7 +52,7 @@
         <v-list-item-avatar size="40" color="#e0e0e0">
           <v-img :src="room.avatar" />
         </v-list-item-avatar>
-        <div class="room-list-notification-count">
+        <div class="room-list-notification-count" v-if="notificationCount(room) > 0">
           {{ notificationCount(room) }}
         </div>
         <v-list-item-content>
diff --git a/src/components/profileInfoMixin.js b/src/components/profileInfoMixin.js
index 02bd1e5..7a9dd35 100644
--- a/src/components/profileInfoMixin.js
+++ b/src/components/profileInfoMixin.js
@@ -1,7 +1,7 @@
 export default {
   computed: {
     user() {
-      if (!this.$matrix.matrixClient) {
+      if (!this.$matrix.ready) {
         return null;
       }
       return this.$matrix.matrixClient.getUser(this.$matrix.currentUserId);
diff --git a/src/services/matrix.service.js b/src/services/matrix.service.js
index 7031306..3a5b188 100644
--- a/src/services/matrix.service.js
+++ b/src/services/matrix.service.js
@@ -391,8 +391,8 @@ export default {
             // Invitation. Need to call "recalculate" to pick
             // up room name, not sure why exactly.
             room.recalculate();
-            this.reloadRooms();
           }
+          this.reloadRooms();
         },
 
         onSessionLoggedOut() {