diff --git a/app/javascript/submission_form/attachment_step.vue b/app/javascript/submission_form/attachment_step.vue
index 8224a3ae..2da33867 100644
--- a/app/javascript/submission_form/attachment_step.vue
+++ b/app/javascript/submission_form/attachment_step.vue
@@ -45,7 +45,7 @@
       >
     </template>
     <FileDropzone
-      :message="`Upload ${field.name || 'Attachments'}`"
+      :message="`Upload ${field.name || 'Attachments'}${field.required ? '' : ' (optional)'}`"
       :submitter-slug="submitterSlug"
       @upload="onUpload"
     />
diff --git a/app/javascript/submission_form/form.vue b/app/javascript/submission_form/form.vue
index 47bdac23..33a20059 100644
--- a/app/javascript/submission_form/form.vue
+++ b/app/javascript/submission_form/form.vue
@@ -232,7 +232,7 @@
         <button
           type="submit"
           class="base-button w-full flex justify-center"
-          :disabled="isSubmitting"
+          :disabled="isSubmitting || (currentField.required && ['image', 'file'].includes(currentField.type) && !values[currentField.uuid]?.length)"
         >
           <span class="flex">
             <IconInnerShadowTop
diff --git a/app/javascript/submission_form/image_step.vue b/app/javascript/submission_form/image_step.vue
index c22ee6d9..6038abf3 100644
--- a/app/javascript/submission_form/image_step.vue
+++ b/app/javascript/submission_form/image_step.vue
@@ -27,7 +27,7 @@
   <div>
     <FileDropzone
       v-if="!modelValue"
-      :message="`Upload ${field.name || 'Image'}`"
+      :message="`Upload ${field.name || 'Image'}${field.required ? '' : ' (optional)'}`"
       :submitter-slug="submitterSlug"
       :accept="'image/*'"
       @upload="onImageUpload"