diff --git a/src/main/webapp/app/entities/flow-import/flow-import-upload-multifile.component.ts b/src/main/webapp/app/entities/flow-import/flow-import-upload-multifile.component.ts
index cb7a5cf3..d5456ca9 100644
--- a/src/main/webapp/app/entities/flow-import/flow-import-upload-multifile.component.ts
+++ b/src/main/webapp/app/entities/flow-import/flow-import-upload-multifile.component.ts
@@ -20,7 +20,9 @@ export default defineComponent({
     const flowImportService = inject('flowImportService', () => new FlowImportService());
     const excelFile = ref();
     const isFetching = ref(false);
+    const fileToBeSubmited = ref(false);
     const fileSubmited = ref(false);
+    const analyseToBeImported = ref(false);
     const rowsLoaded = ref(false);
     const excelFileName = ref('Browse File');
 
@@ -29,6 +31,7 @@ export default defineComponent({
 
     function handleFileUpload(): void {
       excelFileName.value = excelFile.value.files[0].name;
+      fileToBeSubmited.value = true;
     }
 
     // STEP 1 - Upload file and retreive all sheet with name starting with FLW
@@ -50,20 +53,19 @@ export default defineComponent({
     }
 
     function selectAll() {
-      if (!fileSubmited.value) {
-        checkedNames.value = [];
-        checkedNames.value.push(...summary.value.map(sum => sum.sheetName));
-      }
+      checkedNames.value = [];
+      checkedNames.value.push(...summary.value.map(sum => sum.sheetName));
     }
 
     function selectNone() {
-      if (!fileSubmited.value) checkedNames.value = [];
+      checkedNames.value = [];
     }
 
     // Step 2 - Submit de file and selected sheet names
 
     function submitFile(): void {
       isFetching.value = true;
+      analyseToBeImported.value = true;
       // send file n times, sheet by sheet
       // this is not optimal, but it's the easier way to have a reactive behavior and avoid time out
       // serialized to avoid database transactional problem
@@ -129,6 +131,8 @@ export default defineComponent({
       dtos,
       excelFileName,
       filterErrors,
+      fileToBeSubmited,
+      analyseToBeImported,
     };
   },
 });
diff --git a/src/main/webapp/app/entities/flow-import/flow-import-upload-multifile.vue b/src/main/webapp/app/entities/flow-import/flow-import-upload-multifile.vue
index d23a49b1..50ebee1e 100644
--- a/src/main/webapp/app/entities/flow-import/flow-import-upload-multifile.vue
+++ b/src/main/webapp/app/entities/flow-import/flow-import-upload-multifile.vue
@@ -25,7 +25,7 @@
       </div>
 
       <div class="form-group" v-if="excelFile && summary.length == 0">
-        <button type="submit" class="btn btn-primary mb-2" v-on:click="getSheetnames()" :disabled="fileSubmited">Submit File</button>
+        <button type="submit" class="btn btn-primary mb-2" v-on:click="getSheetnames()" :disabled="!fileToBeSubmited">Submit File</button>
       </div>
 
       <div v-if="summary.length > 0" class="col-md-12">
@@ -42,7 +42,7 @@
                 v-model="checkedNames"
                 :value="row.sheetName"
                 :id="'CHK-' + row.sheetName"
-                :disabled="fileSubmited"
+                :disabled="analyseToBeImported"
                 checked="false"
               />
               <label :for="'CHK-' + row.sheetName" class="">{{ row.sheetName }} </label>
@@ -57,9 +57,9 @@
             </div>
             <div class="col-2"></div>
           </template>
-        </div>
-        <div class="form-group col-md-12" v-if="excelFile">
-          <button type="submit" class="btn btn-primary mb-2" v-on:click="submitFile()" v-if="!fileSubmited">Submit File</button>
+          <div class="form-group col-md-12" v-if="!analyseToBeImported">
+            <button type="submit" class="btn btn-primary mb-2" v-on:click="submitFile()">Submit File</button>
+          </div>
         </div>
       </div>
     </div>