diff --git a/app/package.json b/app/package.json
index 51f926d..bcf2765 100644
--- a/app/package.json
+++ b/app/package.json
@@ -3,7 +3,7 @@
   "type": "module",
   "sideEffects": false,
   "bin": "./dist/cli/index.js",
-  "version": "0.18.0-rc.9",
+  "version": "0.18.0-rc.10",
   "description": "Lightweight Firebase/Supabase alternative built to run anywhere — incl. Next.js, React Router, Astro, Cloudflare, Bun, Node, AWS Lambda & more.",
   "homepage": "https://bknd.io",
   "repository": {
diff --git a/app/src/ui/modules/data/components/EntityForm.tsx b/app/src/ui/modules/data/components/EntityForm.tsx
index ae9ba74..63e608e 100644
--- a/app/src/ui/modules/data/components/EntityForm.tsx
+++ b/app/src/ui/modules/data/components/EntityForm.tsx
@@ -242,6 +242,8 @@ function EntityMediaFormField({
    if (!entityId) return;
    const maxLimit = 50;
    const maxItems = field.getMaxItems();
+   const isSingle = maxItems === 1;
+   const limit = isSingle ? 1 : maxItems && maxItems > maxLimit ? maxLimit : maxItems;
 
    const value = useStore(formApi.store, (state) => {
       const val = state.values[field.name];
@@ -264,7 +266,7 @@ function EntityMediaFormField({
             key={key}
             maxItems={maxItems}
             allowedMimeTypes={field.getAllowedMimeTypes()}
-            /* initialItems={value} @todo: test if better be omitted, so it fetches */
+            initialItems={isSingle ? value : undefined}
             onClick={onClick}
             entity={{
                name: entity.name,
@@ -273,7 +275,7 @@ function EntityMediaFormField({
             }}
             query={{
                sort: "-id",
-               limit: maxItems && maxItems > maxLimit ? maxLimit : maxItems,
+               limit,
             }}
          />
       </Formy.Group>