diff --git a/src/modules/answer_sheet_submissions/answer_sheet_submissions.service.ts b/src/modules/answer_sheet_submissions/answer_sheet_submissions.service.ts
index de55110..98202db 100644
--- a/src/modules/answer_sheet_submissions/answer_sheet_submissions.service.ts
+++ b/src/modules/answer_sheet_submissions/answer_sheet_submissions.service.ts
@@ -150,6 +150,7 @@ export class AnswerSheetSubmissionsService {
         },
       });
       let result;
+      const data = await this.fetchEvalutionTypes(createAnswerSheetSubmissionDto.questionSetId)
       if (existing) {
         this.loggerService.log(
           'Answer Sheet allready uploaded for this user: ' +
@@ -177,6 +178,9 @@ export class AnswerSheetSubmissionsService {
         const insertObject = this.transformToInsertObject(
           createAnswerSheetSubmissionDto,
         );
+        if(data.evaluationType === 'offline'){
+          insertObject.status = 'COMPLETED';
+        }
         insertObject.created_by = createAnswerSheetSubmissionDto.createdBy;
         insertObject.updated_by = createAnswerSheetSubmissionDto.createdBy;
         result = await this.answerSheetSubmissionsRepository.save(insertObject);
@@ -190,7 +194,6 @@ export class AnswerSheetSubmissionsService {
           result.id,
         );
       }
-      const data = await this.fetchEvalutionTypes(createAnswerSheetSubmissionDto.questionSetId)
       if(data.evaluationType === 'ai'){
         let payload: SubmitAssessmentToAiDto = {
           questionSetId: result.questionSetId,