diff --git a/src/fireedge/src/client/features/OneApi/image.js b/src/fireedge/src/client/features/OneApi/image.js
index de20e0b8c0..632fada3e1 100644
--- a/src/fireedge/src/client/features/OneApi/image.js
+++ b/src/fireedge/src/client/features/OneApi/image.js
@@ -55,13 +55,17 @@ const imageApi = oneApi.injectEndpoints({
         return { params, command }
       },
       transformResponse: (data) => {
-        const images = data?.IMAGE_POOL?.IMAGE?.filter?.((image) =>
-          IMAGE_TYPES_FOR_IMAGES.some(
-            (imageType) => imageType === getType(image)
-          )
+        const imagesPool = data?.IMAGE_POOL?.IMAGE
+          ? Array.isArray(data.IMAGE_POOL.IMAGE)
+            ? data.IMAGE_POOL.IMAGE
+            : [data.IMAGE_POOL.IMAGE]
+          : []
+
+        const images = imagesPool?.filter?.((image) =>
+          IMAGE_TYPES_FOR_IMAGES.some(() => getType(image))
         )
 
-        return [images ?? []].flat()
+        return images.flat()
       },
       providesTags: (images) =>
         images