diff --git a/src/components/fields/File/SideDrawerField.tsx b/src/components/fields/File/SideDrawerField.tsx
index 94fe90b2..cad34d9b 100644
--- a/src/components/fields/File/SideDrawerField.tsx
+++ b/src/components/fields/File/SideDrawerField.tsx
@@ -42,7 +42,7 @@ export default function File_({
 
   const onDrop = useCallback(
     (acceptedFiles: File[]) => {
-      if (acceptedFiles.length > 0) {
+      if (_rowy_ref && acceptedFiles.length > 0) {
         upload({
           docRef: _rowy_ref! as any,
           fieldName: column.key,
diff --git a/src/components/fields/Image/SideDrawerField.tsx b/src/components/fields/Image/SideDrawerField.tsx
index 76d87a1d..304e0555 100644
--- a/src/components/fields/Image/SideDrawerField.tsx
+++ b/src/components/fields/Image/SideDrawerField.tsx
@@ -105,6 +105,7 @@ export default function Image_({
           files: acceptedFiles,
           onComplete: (newUploads) => {
             onChange(arrayUnion(newUploads));
+            onSubmit();
             setLocalImages([]);
           },
         });