diff --git a/app/javascript/vue/shared/content/attachments.vue b/app/javascript/vue/shared/content/attachments.vue
index 77e39e291..e9ad4b02b 100644
--- a/app/javascript/vue/shared/content/attachments.vue
+++ b/app/javascript/vue/shared/content/attachments.vue
@@ -90,6 +90,9 @@ export default {
   },
   computed: {
     attachmentsOrdered() {
+      if (this.attachments.some((attachment) => attachment.attributes.uploading)) {
+        return this.attachments;
+      }
       return this.attachments.sort((a, b) => {
         if (a.attributes.asset_order == b.attributes.asset_order) {
           switch (this.parent.attributes.assets_order) {