diff --git a/core/src/lib/util/media.util.ts b/core/src/lib/util/media.util.ts
index 126edaae..c8d08482 100644
--- a/core/src/lib/util/media.util.ts
+++ b/core/src/lib/util/media.util.ts
@@ -41,12 +41,10 @@ function hasCustomFolder(
     return false;
   }
 
-  if (!isMediaField(folderKey, field)) {
-    return false;
-  }
-
-  if (field[folderKey]) {
-    return true;
+  if (isMediaField(folderKey, field)) {
+    if (field[folderKey]) {
+      return true;
+    }
   }
 
   if ('files' in collection) {