diff --git a/src/modules/notifications.js b/src/modules/notifications.js
index a3cf76ef..9bd38220 100644
--- a/src/modules/notifications.js
+++ b/src/modules/notifications.js
@@ -52,7 +52,7 @@ export const notifications = {
       })
     },
     markSingleNotificationAsSeen (state, { id }) {
-      const notification = find(state.data, n => n.id === id)
+      const notification = state.idStore[id]
       if (notification) notification.seen = true
     },
     dismissNotification (state, { id }) {
@@ -60,7 +60,7 @@ export const notifications = {
       delete state.idStore[id]
     },
     updateNotification (state, { id, updater }) {
-      const notification = find(state.data, n => n.id === id)
+      const notification = state.idStore[id]
       notification && updater(notification)
     }
   },
@@ -113,7 +113,7 @@ export const notifications = {
         }
       })
     },
-    notificationClicked ({ state, commit }, { id }) {
+    notificationClicked ({ state, dispatch }, { id }) {
       const notification = state.idStore[id]
       const { type, seen } = notification
 
@@ -124,7 +124,7 @@ export const notifications = {
           case 'follow_request':
             break
           default:
-            commit('markSingleNotificationAsSeen', { id })
+            dispatch('markSingleNotificationAsSeen', { id })
         }
       }
     },
diff --git a/src/services/notification_utils/notification_utils.js b/src/services/notification_utils/notification_utils.js
index 675e744e..342fe6ef 100644
--- a/src/services/notification_utils/notification_utils.js
+++ b/src/services/notification_utils/notification_utils.js
@@ -82,7 +82,11 @@ export const unseenNotificationsFromStore = store =>
 export const prepareNotificationObject = (notification, i18n) => {
   if (cachedBadgeUrl === null) {
     const favicon = FaviconService.getOriginalFavicons()[0]
-    cachedBadgeUrl = favicon.favimg.href
+    if (!favicon) {
+      cachedBadgeUrl = 'about:blank'
+    } else {
+      cachedBadgeUrl = favicon.favimg.href
+    }
   }
 
   const notifObj = {