diff --git a/packages/core/upload/admin/src/components/AssetCard/UploadingAssetCard.js b/packages/core/upload/admin/src/components/AssetCard/UploadingAssetCard.js
index 058c1b803a..7e602e65cb 100644
--- a/packages/core/upload/admin/src/components/AssetCard/UploadingAssetCard.js
+++ b/packages/core/upload/admin/src/components/AssetCard/UploadingAssetCard.js
@@ -130,7 +130,7 @@ UploadingAssetCard.propTypes = {
     rawFile: PropTypes.instanceOf(File),
     type: PropTypes.oneOf(Object.values(AssetType)),
   }).isRequired,
-  folderId: PropTypes.number,
+  folderId: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
   onCancel: PropTypes.func.isRequired,
   onStatusChange: PropTypes.func.isRequired,
 };
diff --git a/packages/core/upload/admin/src/components/EditAssetDialog/index.js b/packages/core/upload/admin/src/components/EditAssetDialog/index.js
index 12827d8e37..dacd7afe16 100644
--- a/packages/core/upload/admin/src/components/EditAssetDialog/index.js
+++ b/packages/core/upload/admin/src/components/EditAssetDialog/index.js
@@ -108,7 +108,7 @@ export const EditAssetDialog = ({
     alternativeText: asset.alternativeText ?? undefined,
     caption: asset.caption ?? undefined,
     parent: {
-      value: activeFolderId ?? null,
+      value: activeFolderId ?? undefined,
       label:
         findRecursiveFolderByValue(folderStructure, activeFolderId)?.label ??
         folderStructure[0].label,
diff --git a/packages/core/upload/admin/src/components/EditFolderDialog/EditFolderDialog.js b/packages/core/upload/admin/src/components/EditFolderDialog/EditFolderDialog.js
index c72d0c4a3b..5212cd7819 100644
--- a/packages/core/upload/admin/src/components/EditFolderDialog/EditFolderDialog.js
+++ b/packages/core/upload/admin/src/components/EditFolderDialog/EditFolderDialog.js
@@ -54,7 +54,9 @@ export const EditFolderDialog = ({ onClose, folder, parentFolderId }) => {
   const initialFormData = !folderStructureIsLoading && {
     name: folder?.name ?? undefined,
     parent: {
-      value: parentFolderId ? parseInt(parentFolderId, 10) : folderStructure[0].value,
+      /* ideally we would use folderStructure[0].value, but since it is null
+         react complains about rendering null as field value */
+      value: parentFolderId ? parseInt(parentFolderId, 10) : undefined,
       label: parentFolderId
         ? findRecursiveFolderByValue(folderStructure, parseInt(parentFolderId, 10))?.label
         : folderStructure[0].label,
@@ -291,5 +293,5 @@ EditFolderDialog.defaultProps = {
 EditFolderDialog.propTypes = {
   folder: FolderDefinition,
   onClose: PropTypes.func.isRequired,
-  parentFolderId: PropTypes.number,
+  parentFolderId: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
 };
diff --git a/packages/core/upload/admin/src/components/SelectTree/Option.js b/packages/core/upload/admin/src/components/SelectTree/Option.js
index 1e34a81794..6a49b2f5e0 100644
--- a/packages/core/upload/admin/src/components/SelectTree/Option.js
+++ b/packages/core/upload/admin/src/components/SelectTree/Option.js
@@ -50,12 +50,12 @@ const Option = ({ children, data, selectProps, ...props }) => {
 };
 
 Option.propTypes = {
-  children: PropTypes.arrayOf(PropTypes.element).isRequired,
+  children: PropTypes.node.isRequired,
   data: PropTypes.object.isRequired,
   onToggle: PropTypes.func.isRequired,
   selectProps: PropTypes.shape({
     maxDisplayDepth: PropTypes.number,
-    openValues: PropTypes.arrayOf([PropTypes.string, PropTypes.number]),
+    openValues: PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.string, PropTypes.number])),
     onOptionToggle: PropTypes.func,
   }).isRequired,
 };
diff --git a/packages/core/upload/admin/src/components/UploadAssetDialog/PendingAssetStep/PendingAssetStep.js b/packages/core/upload/admin/src/components/UploadAssetDialog/PendingAssetStep/PendingAssetStep.js
index 24ea8cc136..bf7ece6439 100644
--- a/packages/core/upload/admin/src/components/UploadAssetDialog/PendingAssetStep/PendingAssetStep.js
+++ b/packages/core/upload/admin/src/components/UploadAssetDialog/PendingAssetStep/PendingAssetStep.js
@@ -171,7 +171,7 @@ PendingAssetStep.defaultProps = {
 PendingAssetStep.propTypes = {
   addUploadedFiles: PropTypes.func,
   assets: PropTypes.arrayOf(AssetDefinition).isRequired,
-  folderId: PropTypes.number,
+  folderId: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
   onClose: PropTypes.func.isRequired,
   onEditAsset: PropTypes.func.isRequired,
   onRemoveAsset: PropTypes.func.isRequired,
diff --git a/packages/core/upload/admin/src/components/UploadAssetDialog/UploadAssetDialog.js b/packages/core/upload/admin/src/components/UploadAssetDialog/UploadAssetDialog.js
index 34a0a2b248..e8dd57f521 100644
--- a/packages/core/upload/admin/src/components/UploadAssetDialog/UploadAssetDialog.js
+++ b/packages/core/upload/admin/src/components/UploadAssetDialog/UploadAssetDialog.js
@@ -133,7 +133,7 @@ UploadAssetDialog.defaultProps = {
 
 UploadAssetDialog.propTypes = {
   addUploadedFiles: PropTypes.func,
-  folderId: PropTypes.number,
+  folderId: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
   initialAssetsToAdd: PropTypes.arrayOf(AssetDefinition),
   onClose: PropTypes.func.isRequired,
   trackedLocation: PropTypes.string,