diff --git a/src/admin/components/forms/field-types/Upload/Input.tsx b/src/admin/components/forms/field-types/Upload/Input.tsx
index 683ad3d2f6..d4bbeea54d 100644
--- a/src/admin/components/forms/field-types/Upload/Input.tsx
+++ b/src/admin/components/forms/field-types/Upload/Input.tsx
@@ -11,6 +11,7 @@ import { FieldTypes } from '..';
 import AddModal from './Add';
 import SelectExistingModal from './SelectExisting';
 import { SanitizedCollectionConfig } from '../../../../../collections/config/types';
+import { useEditDepth, EditDepthContext } from '../../../utilities/EditDepth';
 
 import './index.scss';
 
@@ -58,13 +59,15 @@ const UploadInput: React.FC<UploadInputProps> = (props) => {
     filterOptions,
   } = props;
 
-  const { toggleModal } = useModal();
+  const { toggleModal, modalState } = useModal();
+  const editDepth = useEditDepth();
 
-  const addModalSlug = `${path}-add`;
-  const selectExistingModalSlug = `${path}-select-existing`;
+  const addModalSlug = `${path}-add-depth-${editDepth}`;
+  const selectExistingModalSlug = `${path}-select-existing-depth-${editDepth}`;
 
   const [file, setFile] = useState(undefined);
   const [missingFile, setMissingFile] = useState(false);
+  const [modalToRender, setModalToRender] = useState<string>();
 
   const classes = [
     'field-type',
@@ -98,6 +101,12 @@ const UploadInput: React.FC<UploadInputProps> = (props) => {
     serverURL,
   ]);
 
+  useEffect(() => {
+    if (!modalState[addModalSlug]?.isOpen && !modalState[selectExistingModalSlug]?.isOpen) {
+      setModalToRender(undefined);
+    }
+  }, [modalState, addModalSlug, selectExistingModalSlug]);
+
   return (
     <div
       className={classes}
@@ -132,6 +141,7 @@ const UploadInput: React.FC<UploadInputProps> = (props) => {
                 buttonStyle="secondary"
                 onClick={() => {
                   toggleModal(addModalSlug);
+                  setModalToRender(addModalSlug);
                 }}
               >
                 Upload new
@@ -142,33 +152,40 @@ const UploadInput: React.FC<UploadInputProps> = (props) => {
                 buttonStyle="secondary"
                 onClick={() => {
                   toggleModal(selectExistingModalSlug);
+                  setModalToRender(selectExistingModalSlug);
                 }}
               >
                 Choose from existing
               </Button>
             </div>
           )}
-          <AddModal
-            {...{
-              collection,
-              slug: addModalSlug,
-              fieldTypes,
-              setValue: (e) => {
-                setMissingFile(false);
-                onChange(e);
-              },
-            }}
-          />
-          <SelectExistingModal
-            {...{
-              collection,
-              slug: selectExistingModalSlug,
-              setValue: onChange,
-              addModalSlug,
-              filterOptions,
-              path,
-            }}
-          />
+          <EditDepthContext.Provider value={editDepth + 1}>
+            {modalToRender === addModalSlug && (
+              <AddModal
+                {...{
+                  collection,
+                  slug: addModalSlug,
+                  fieldTypes,
+                  setValue: (e) => {
+                    setMissingFile(false);
+                    onChange(e);
+                  },
+                }}
+              />
+            )}
+            {modalToRender === selectExistingModalSlug && (
+              <SelectExistingModal
+                {...{
+                  collection,
+                  slug: selectExistingModalSlug,
+                  setValue: onChange,
+                  addModalSlug,
+                  filterOptions,
+                  path,
+                }}
+              />
+            )}
+          </EditDepthContext.Provider>
           <FieldDescription
             value={file}
             description={description}
diff --git a/test/fields/collections/Upload/index.ts b/test/fields/collections/Upload/index.ts
index 4d6e54f0dc..91ed422ed7 100644
--- a/test/fields/collections/Upload/index.ts
+++ b/test/fields/collections/Upload/index.ts
@@ -1,5 +1,5 @@
-import { CollectionConfig } from '../../../../src/collections/config/types';
 import path from 'path';
+import { CollectionConfig } from '../../../../src/collections/config/types';
 
 const Uploads: CollectionConfig = {
   slug: 'uploads',
@@ -11,6 +11,11 @@ const Uploads: CollectionConfig = {
       type: 'text',
       name: 'text',
     },
+    {
+      type: 'upload',
+      name: 'media',
+      relationTo: 'uploads',
+    },
   ],
 };