diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue
index 1543c15c..5c35cf31 100644
--- a/src/components/nav_panel/nav_panel.vue
+++ b/src/components/nav_panel/nav_panel.vue
@@ -17,7 +17,7 @@
             <i class="button-icon icon-mail-alt" /> {{ $t("nav.dms") }}
           </router-link>
         </li>
-        <li style="position: relative">
+        <li v-if="currentUser">
           <router-link :to="{ name: 'chats', params: { username: currentUser.screen_name } }">
             <i class="button-icon icon-chat" /> {{ $t("nav.chats") }}
           </router-link>
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index ea05396a..e854454d 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -218,7 +218,7 @@ const PostStatusForm = {
             poll: {}
           }
           this.pollFormVisible = false
-          this.$refs.mediaUpload.clearFile()
+          this.$refs.mediaUpload && this.$refs.mediaUpload.clearFile()
           this.clearPollForm()
           this.$emit('posted', data)
           if (this.preserveFocus) {
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 20e7a616..3d321d65 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -382,6 +382,7 @@ export const parseChat = (chat) => {
 
 export const parseChatMessage = (message) => {
   let output = message
+  output.id = parseInt(message.id, 10)
   output.created_at = new Date(message.created_at)
   output.chat_id = parseInt(message.chat_id, 10)
   return output