diff --git a/webapp/components/notifications/NotificationList.spec.js b/webapp/components/notifications/NotificationList.spec.js
index 3f120f397..1b4355c08 100644
--- a/webapp/components/notifications/NotificationList.spec.js
+++ b/webapp/components/notifications/NotificationList.spec.js
@@ -24,68 +24,70 @@ config.stubs['v-popover'] = '<span><slot /></span>'
 describe('NotificationList.vue', () => {
   let wrapper
   let Wrapper
-  let propsData
   let mocks
   let stubs
-  let getters
-  let actions
   let user
+  let data
+  let store
+  let markAsRead
 
   beforeEach(() => {
+    store = new Vuex.Store({
+      getters: {
+        'auth/user': () => {
+          return {}
+        }
+      }
+    })
     mocks = {
       $t: jest.fn()
     }
     stubs = {
       NuxtLink: RouterLinkStub
     }
-    actions = {
-      'notifications/markAsRead': jest.fn()
-    }
-    getters = {
-      'auth/user': () => {
-        return {
-          notifications: [
-            {
-              id: 'notification-41',
-              read: false,
-              post: {
-                id: 'post-1',
-                title: 'some post title',
-                contentExcerpt: 'this is a post content',
-                author: {
-                  id: 'john-1',
-                  slug: 'john-doe',
-                  name: 'John Doe'
-                }
-              }
-            },
-            {
-              id: 'notification-42',
-              read: false,
-              post: {
-                id: 'post-2',
-                title: 'another post title',
-                contentExcerpt: 'this is yet another post content',
-                author: {
-                  id: 'john-1',
-                  slug: 'john-doe',
-                  name: 'John Doe'
-                }
+    markAsRead = jest.fn()
+    data = () => {
+      return {
+        notifications: [
+          {
+            id: 'notification-41',
+            read: false,
+            post: {
+              id: 'post-1',
+              title: 'some post title',
+              contentExcerpt: 'this is a post content',
+              author: {
+                id: 'john-1',
+                slug: 'john-doe',
+                name: 'John Doe'
               }
             }
-          ]
-        }
+          },
+          {
+            id: 'notification-42',
+            read: false,
+            post: {
+              id: 'post-2',
+              title: 'another post title',
+              contentExcerpt: 'this is yet another post content',
+              author: {
+                id: 'john-1',
+                slug: 'john-doe',
+                name: 'John Doe'
+              }
+            }
+          }
+        ]
       }
     }
   })
 
   describe('shallowMount', () => {
     const Wrapper = () => {
-      const store = new Vuex.Store({ getters, actions })
       return shallowMount(NotificationList, {
-        store,
-        propsData,
+        data,
         mocks,
+        store,
         localVue
       })
     }
@@ -101,12 +103,11 @@ describe('NotificationList.vue', () => {
 
   describe('mount', () => {
     const Wrapper = () => {
-      const store = new Vuex.Store({ getters, actions })
       return mount(NotificationList, {
-        store,
-        propsData,
+        data,
         mocks,
         stubs,
+        store,
         localVue
       })
     }
@@ -117,6 +118,7 @@ describe('NotificationList.vue', () => {
 
     describe('click on a notification', () => {
       beforeEach(() => {
+        wrapper.setMethods({ markAsRead })
         wrapper
           .findAll(Notification)
           .at(1)
@@ -124,9 +126,7 @@ describe('NotificationList.vue', () => {
       })
 
       it('marks notification as read', () => {
-        expect(actions['notifications/markAsRead'].mock.calls[0][1]).toEqual(
-          'notification-42'
-        )
+        expect(markAsRead).toBeCalledWith('notification-42')
       })
     })
   })
diff --git a/webapp/components/notifications/NotificationList.vue b/webapp/components/notifications/NotificationList.vue
index 3988f257c..ec76e8530 100644
--- a/webapp/components/notifications/NotificationList.vue
+++ b/webapp/components/notifications/NotificationList.vue
@@ -11,25 +11,57 @@
 
 <script>
 import Notification from './Notification'
-import { mapGetters, mapActions } from 'vuex'
+import gql from 'graphql-tag'
+
+const MARK_AS_READ = gql(`
+mutation($id: ID!, $read: Boolean!) {
+  UpdateNotification(id: $id, read: $read) {
+    id
+    read
+  }
+}`)
+
+const NOTIFICATIONS = gql(`{
+  currentUser {
+    id
+    notifications(read: false, orderBy: createdAt_desc) {
+      id read createdAt
+      post {
+        title contentExcerpt slug
+        author { id slug name disabled deleted }
+      }
+    }
+  }
+}`)
 
 export default {
   name: 'NotificationList',
   components: {
     Notification
   },
-  computed: {
-    ...mapGetters({
-      currentUser: 'auth/user'
-    }),
-    notifications() {
-      return this.currentUser.notifications
+  methods: {
+    async markAsRead(notificationId) {
+      const variables = { id: notificationId, read: true }
+      try {
+        await this.$apollo.mutate({
+          mutation: MARK_AS_READ,
+          variables
+        })
+      } catch (err) {
+        throw new Error(err)
+      }
     }
   },
-  methods: {
-    ...mapActions({
-      markAsRead: 'notifications/markAsRead'
-    })
+  apollo: {
+    notifications: {
+      query: NOTIFICATIONS,
+      update: data => {
+        const {
+          currentUser: { notifications }
+        } = data
+        return notifications
+      }
+    }
   }
 }
 </script>