diff --git a/packages/core/upload/admin/src/components/EditAssetDialog/index.js b/packages/core/upload/admin/src/components/EditAssetDialog/index.js
index 8e20db9154..ae74784a89 100644
--- a/packages/core/upload/admin/src/components/EditAssetDialog/index.js
+++ b/packages/core/upload/admin/src/components/EditAssetDialog/index.js
@@ -98,8 +98,8 @@ export const EditAssetDialog = ({
   const activeFolderId = asset?.folder?.id;
   const initialFormData = {
     name: asset.name,
-    alternativeText: asset.alternativeText || '',
-    caption: asset.caption || '',
+    alternativeText: asset.alternativeText ?? undefined,
+    caption: asset.caption ?? undefined,
     parent: {
       value: activeFolderId ?? null,
       label:
diff --git a/packages/core/upload/admin/src/components/EditFolderDialog/EditFolderDialog.js b/packages/core/upload/admin/src/components/EditFolderDialog/EditFolderDialog.js
index b218769f34..beaccee782 100644
--- a/packages/core/upload/admin/src/components/EditFolderDialog/EditFolderDialog.js
+++ b/packages/core/upload/admin/src/components/EditFolderDialog/EditFolderDialog.js
@@ -46,7 +46,7 @@ export const EditFolderDialog = ({ onClose, folder, folderStructure, canUpdate }
   const activeFolderId = folder?.parent?.id ?? query?.folder;
   const formDisabled = !canUpdate;
   const initialFormData = {
-    name: folder?.name,
+    name: folder?.name ?? undefined,
     parent: {
       value: activeFolderId ? parseInt(activeFolderId, 10) : folderStructure[0].value,
       label: activeFolderId