diff --git a/src/services/ecogesture.service.spec.ts b/src/services/ecogesture.service.spec.ts
index ee58245e797b2b9fcaa74de763dc87884bc0be70..a06515e45d0f4e3b127402a0d1595a8aebc8e449 100644
--- a/src/services/ecogesture.service.spec.ts
+++ b/src/services/ecogesture.service.spec.ts
@@ -67,10 +67,10 @@ describe('Ecogesture service', () => {
       const result = await ecogestureService.getAllEcogestures()
       expect(result).toEqual(mockData)
     })
-    it('shoud return null when no ecogestures stored', async () => {
-      mockClient.query.mockResolvedValueOnce({ data: null })
+    it('shoud return empty array when no ecogestures stored', async () => {
+      mockClient.query.mockResolvedValueOnce({ data: [] })
       const result = await ecogestureService.getAllEcogestures()
-      expect(result).toBe(null)
+      expect(result).toEqual([])
     })
   })
 
@@ -84,7 +84,7 @@ describe('Ecogesture service', () => {
       expect(result).toBe(true)
     })
     it('shoud return true when no ecogestures stored', async () => {
-      mockClient.query.mockImplementation(() => Promise.resolve({ data: null }))
+      mockClient.query.mockImplementation(() => Promise.resolve({ data: [] }))
       const result = await ecogestureService.deleteAllEcogestures()
       expect(result).toBe(true)
     })
diff --git a/src/services/ecogesture.service.ts b/src/services/ecogesture.service.ts
index fb806511ac3aa9a1281c28676f8b1665a30ed370..abd214456cbccd7524b9f28dcb257b3dc20dd14f 100644
--- a/src/services/ecogesture.service.ts
+++ b/src/services/ecogesture.service.ts
@@ -9,18 +9,15 @@ export default class EcogestureService {
     this._client = _client
   }
 
-  public async getAllEcogestures(): Promise<Ecogesture[] | null> {
+  public async getAllEcogestures(): Promise<Ecogesture[]> {
     const ecogestures = await this._client.query(
       this._client.find(ECOGESTURE_DOCTYPE)
     )
-    if (!ecogestures) return null
-
     return ecogestures.data
   }
 
   public async deleteAllEcogestures(): Promise<boolean> {
     const ecogestures = await this.getAllEcogestures()
-    if (!ecogestures) return true
     try {
       for (let index = 0; index < ecogestures.length; index++) {
         await this._client.destroy(ecogestures[index])