diff --git a/src/fireedge/src/client/hooks/useFetch.js b/src/fireedge/src/client/hooks/useFetch.js
index f542384a11..46b104d774 100644
--- a/src/fireedge/src/client/hooks/useFetch.js
+++ b/src/fireedge/src/client/hooks/useFetch.js
@@ -16,7 +16,6 @@
 import { useReducer, useCallback, useEffect, useRef, ReducerState, ReducerAction } from 'react'
 import { fakeDelay } from 'client/utils'
 
-/** @enum {string} Status of request */
 const STATUS = {
   INIT: 'INIT',
   PENDING: 'PENDING',
@@ -153,7 +152,7 @@ const useFetch = (request, socket) => {
       return fakeDelay(delay).then(() => doFetch(payload, reload))
     }, [request])
 
-  return { ...state, fetchRequest, STATUS, ACTIONS }
+  return { ...state, fetchRequest, STATUS }
 }
 
 export default useFetch
diff --git a/src/fireedge/src/client/hooks/useFetchAll.js b/src/fireedge/src/client/hooks/useFetchAll.js
index 248eb13a30..197e3adcbf 100644
--- a/src/fireedge/src/client/hooks/useFetchAll.js
+++ b/src/fireedge/src/client/hooks/useFetchAll.js
@@ -16,7 +16,6 @@
 import { useReducer, useCallback, useEffect, useRef, ReducerState, ReducerAction } from 'react'
 import { fakeDelay } from 'client/utils'
 
-/** @enum {string} Status of request */
 const STATUS = {
   INIT: 'INIT',
   PENDING: 'PENDING',
@@ -123,7 +122,7 @@ const useFetchAll = () => {
      * @param {number} options.delay - Delay to trigger the request
      * @returns {Promise} - Returns a promise with responses or error
      */
-    (requests, options = {}) => {
+    async (requests, options = {}) => {
       const { reload = false, delay = 0 } = options
 
       if (!(Number.isInteger(delay) && delay >= 0)) {
@@ -132,10 +131,11 @@ const useFetchAll = () => {
           If you're using it as a function, it must also return a number >= 0.`)
       }
 
-      return fakeDelay(delay).then(() => doFetches(requests, reload))
+      await fakeDelay(delay)
+      return await doFetches(requests, reload)
     }, [])
 
-  return { ...state, fetchRequestAll, STATUS, ACTIONS }
+  return { ...state, fetchRequestAll, STATUS }
 }
 
 export default useFetchAll