1 files changed, 3 insertions, 1 deletions
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 46117fd7..826b544c 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -126,7 +126,7 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
   // This makes sure that user timeline won't get data meant for other
   // user. I.e. opening different user profiles makes request which could
   // return data late after user already viewing different user profile
-  if (timeline === 'user' && timelineObject.userId !== userId) {
+  if ((timeline === 'user' || timeline === 'media') && timelineObject.userId !== userId) {
     return
   }
 
@@ -303,6 +303,8 @@ const addNewNotifications = (state, { dispatch, notifications, older, visibleNot
           setTimeout(notification.close.bind(notification), 5000)
         }
       }
+    } else if (notification.seen) {
+      state.notifications.idStore[notification.id].seen = true
     }
   })
 }