diff --git a/feature-utils/poly-import/src/storage.js b/feature-utils/poly-import/src/storage.js
index 07828f2891..3e6fb05129 100644
--- a/feature-utils/poly-import/src/storage.js
+++ b/feature-utils/poly-import/src/storage.js
@@ -17,7 +17,6 @@ export class FeatureFileStorage {
             statResults[file.id] = await polyOut.stat(file.id);
         }
         this._files = statResults;
-        return files;
     }
 
     async readFile(path) {
diff --git a/feature-utils/poly-look/src/react-components/contexts/poly-import.jsx b/feature-utils/poly-look/src/react-components/contexts/poly-import.jsx
index eefe86dfe5..cf3b26001d 100644
--- a/feature-utils/poly-look/src/react-components/contexts/poly-import.jsx
+++ b/feature-utils/poly-look/src/react-components/contexts/poly-import.jsx
@@ -32,14 +32,11 @@ export const PolyImportProvider = ({
     storage
       .refreshFiles()
       .then(async () => {
-        const resolvedFiles = [];
         if (!storage.files) {
           setFiles(null);
           return;
         }
-        for (const file of storage.files) {
-          resolvedFiles.push(await file);
-        }
+        const resolvedFiles = await Promise.all(storage.files);
         setFiles(resolvedFiles);
         setIsLoading(false);
       })
@@ -54,11 +51,8 @@ export const PolyImportProvider = ({
   useEffect(() => {
     if (!pod) return;
     const storage = new FeatureFileStorage(pod, async () => {
-      const resolvedFiles = [];
-      for (const file of storage.files) {
-        resolvedFiles.push(await file);
-      }
-      setFiles(Object.values(resolvedFiles));
+      const resolvedFiles = await Promise.all(storage.files);
+      setFiles(resolvedFiles);
     });
     setStorage(storage);
   }, [pod]);