diff --git a/src/components/Document/DocumentNotes.vue b/src/components/Document/DocumentNotes.vue
index d3d83ad6ae..1311d0a220 100644
--- a/src/components/Document/DocumentNotes.vue
+++ b/src/components/Document/DocumentNotes.vue
@@ -30,13 +30,12 @@ export default {
   computed: {
     ...mapState('search', ['index'])
   },
-  mounted() {
-    this.retrieveNotes(this.index, this.path)
+  async beforeMount() {
+    this.notes = await this.retrieveNotes(this.index, this.path)
   },
   methods: {
-    async retrieveNotes(project, path) {
-      const notes = await this.$store.dispatch('documentNotes/retrieveNotes', { project, path })
-      this.notes = notes
+    retrieveNotes(project, path) {
+      return this.$store.dispatch('documentNotes/retrieveNotes', { project, path })
     }
   }
 }
diff --git a/tests/unit/specs/components/Document/DocumentNotes.spec.js b/tests/unit/specs/components/Document/DocumentNotes.spec.js
index 8938df8b41..9e50d21db8 100644
--- a/tests/unit/specs/components/Document/DocumentNotes.spec.js
+++ b/tests/unit/specs/components/Document/DocumentNotes.spec.js
@@ -1,38 +1,54 @@
-import { shallowMount } from '@vue/test-utils'
+import { flushPromises, shallowMount } from '@vue/test-utils'
 
 import CoreSetup from '~tests/unit/CoreSetup'
 import DocumentNotes from '@/components/Document/DocumentNotes'
 
 describe('DocumentNotes.vue', () => {
-  let wrapper, core, api
+  let wrapper, plugins, api, store
+  const path = '/this/is/a/'
+  const project = 'banana-papers'
+  const note1 = { note: 'This is a note', project, path: '/this/is/a/', variant: 'warning' }
+  const note2 = { note: 'This is a second note', project, path: '/this/is/', variant: 'error' }
+  beforeAll(() => {
+    api = { retrieveNotes: vi.fn() }
+    const core = CoreSetup.init(api).useAll()
 
+    plugins = core.plugins
+    store = core.store
+    store.commit('search/index', project)
+  })
   beforeEach(() => {
-    api = { retrieveNotes: vi.fn() }
-    core = CoreSetup.init(api).useAll()
-    wrapper = shallowMount(DocumentNotes, { global: { plugins: core.plugins } })
+    store.state.documentNotes.notes = {}
   })
 
   it('should NOT display note on document', () => {
+    wrapper = shallowMount(DocumentNotes, { global: { plugins } })
     expect(wrapper.find('b-alert-stub').exists()).toBeFalsy()
   })
 
   it('should display note on document', async () => {
-    await wrapper.setData({ notes: [{ note: 'This is a note', variant: 'warning' }] })
+    const notes = [note1]
+    api.retrieveNotes.mockResolvedValue(notes)
+    wrapper = shallowMount(DocumentNotes, { global: { plugins }, props: { path } })
+    await flushPromises()
     expect(wrapper.find('b-alert-stub').exists()).toBeTruthy()
   })
 
   it('should display 2 notes on document', async () => {
-    await wrapper.setData({
-      notes: [
-        { note: 'This is a note', variant: 'warning' },
-        { note: 'Another note', variant: 'error' }
-      ]
-    })
+    const notes = [note1, note2]
+    api.retrieveNotes.mockResolvedValue(notes)
+    wrapper = shallowMount(DocumentNotes, { global: { plugins }, props: { path } })
+    await flushPromises()
     expect(wrapper.findAll('b-alert-stub')).toHaveLength(2)
   })
 
   it('should display note on document with default variant: warning', async () => {
-    await wrapper.setData({ notes: [{ note: 'This is a note' }] })
+    const noteNoVariant = { note: 'This is note without variant', project, path: '/this/is/a/' }
+
+    const notes = [noteNoVariant]
+    api.retrieveNotes.mockResolvedValue(notes)
+    wrapper = shallowMount(DocumentNotes, { global: { plugins }, props: { path } })
+    await flushPromises()
     expect(wrapper.find('b-alert-stub').exists()).toBeTruthy()
     expect(wrapper.find('b-alert-stub').attributes('variant')).toBe('warning')
   })