diff --git a/src/components/chat_panel/chat_panel.js b/src/components/chat_panel/chat_panel.js
index d528d0a1..d8736d17 100644
--- a/src/components/chat_panel/chat_panel.js
+++ b/src/components/chat_panel/chat_panel.js
@@ -3,7 +3,7 @@ const chatPanel = {
     return {
       currentMessage: '',
       channel: null,
-      collapsed: false
+      collapsed: true
     }
   },
   computed: {
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index bd52f161..b493c212 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -45,7 +45,7 @@ export const prepareStatus = (status) => {
   if (status.nsfw === undefined) {
     status.nsfw = isNsfw(status)
     if (status.retweeted_status) {
-      status.retweeted_status.nsfw = status.nsfw
+      status.nsfw = status.retweeted_status.nsfw
     }
   }
 
@@ -136,7 +136,7 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
 
     if (result.new) {
       if (statusType(status) === 'retweet' && status.retweeted_status.user.id === user.id) {
-        addNotification({ type: 'repeat', status: status.retweeted_status, action: status })
+        addNotification({ type: 'repeat', status: status, action: status })
       }
 
       // We are mentioned in a post
diff --git a/test/unit/specs/modules/statuses.spec.js b/test/unit/specs/modules/statuses.spec.js
index 372d1aaa..f929192b 100644
--- a/test/unit/specs/modules/statuses.spec.js
+++ b/test/unit/specs/modules/statuses.spec.js
@@ -297,7 +297,7 @@ describe('The Statuses module', () => {
       mutations.addNewStatuses(state, { statuses: [retweet], user })
 
       expect(state.notifications.length).to.eql(1)
-      expect(state.notifications[0].status).to.eql(status)
+      expect(state.notifications[0].status).to.eql(retweet)
       expect(state.notifications[0].action).to.eql(retweet)
       expect(state.notifications[0].type).to.eql('repeat')
     })