diff --git a/src/fireedge/src/client/features/OneApi/image.js b/src/fireedge/src/client/features/OneApi/image.js
index 632fada3e1..0a4d85d792 100644
--- a/src/fireedge/src/client/features/OneApi/image.js
+++ b/src/fireedge/src/client/features/OneApi/image.js
@@ -61,8 +61,10 @@ const imageApi = oneApi.injectEndpoints({
             : [data.IMAGE_POOL.IMAGE]
           : []
 
-        const images = imagesPool?.filter?.((image) =>
-          IMAGE_TYPES_FOR_IMAGES.some(() => getType(image))
+        const images = imagesPool?.filter((image) =>
+          IMAGE_TYPES_FOR_IMAGES.some(
+            (imageType) => imageType === getType(image)
+          )
         )
 
         return images.flat()
@@ -93,7 +95,13 @@ const imageApi = oneApi.injectEndpoints({
         return { params, command }
       },
       transformResponse: (data) => {
-        const images = data?.IMAGE_POOL?.IMAGE?.filter?.((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_FILES.some(
             (imageType) => imageType === getType(image)
           )
@@ -127,7 +135,13 @@ const imageApi = oneApi.injectEndpoints({
         return { params, command }
       },
       transformResponse: (data) => {
-        const images = data?.IMAGE_POOL?.IMAGE?.filter?.((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_BACKUPS.some(
             (imageType) => imageType === getType(image)
           )