diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 1eb1a3e3..21d21e89 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -269,12 +269,7 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
 }
 
 const addNewNotifications = (state, { dispatch, notifications, older, visibleNotificationTypes }) => {
-  // const allStatuses = state.allStatuses
-  // const allStatusesObject = state.allStatusesObject
   each(notifications, (notification) => {
-    // notification.action = mergeOrAdd(allStatuses, allStatusesObject, notification.action).item
-    // notification.status = notification.status && mergeOrAdd(allStatuses, allStatusesObject, notification.status).item
-
     // Only add a new notification if we don't have one for the same action
     if (!state.notifications.idStore.hasOwnProperty(notification.id)) {
       state.notifications.maxId = notification.id > state.notifications.maxId
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 4ca7f56b..874fb5de 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -180,7 +180,7 @@ export const parseStatus = (data) => {
     output.external_url = data.url
 
     // TODO: handle is_local
-    output.is_local = true
+    output.is_local = data.pleroma.local
   } else {
     output.favorited = data.favorited
     output.fave_num = data.fave_num