diff --git a/src/service/api-service.ts b/src/service/api-service.ts
index 4d4718c1..558602a4 100644
--- a/src/service/api-service.ts
+++ b/src/service/api-service.ts
@@ -168,7 +168,7 @@ const requestPutSurveyData = (
     data: SurveyData,
     token?: string,
 ): Promise<SurveyData> => {
-    return new Promise((resolve, reject) => {
+    return new Promise(resolve => {
         setTimeout(() => {
             axios
                 .put(
@@ -291,7 +291,7 @@ const requestPutSurveyDataReviewer = (
         requestPutDataReviewer(idSurvey, data, token);
     });
 
-    return new Promise(resolve => {
+    return new Promise(() => {
         const surveyData: SurveyData = {
             stateData: stateData,
             data: data,
diff --git a/src/service/survey-service.ts b/src/service/survey-service.ts
index 5f6f1b3f..f311d3f2 100644
--- a/src/service/survey-service.ts
+++ b/src/service/survey-service.ts
@@ -943,23 +943,20 @@ const saveData = (
     fixConditionals(data);
     const isChange = forceUpdate || dataIsChange(idSurvey, data);
     const promisesToWait: Promise<any>[] = [];
+
+    data = updateLocked(idSurvey, data);
     datas.set(idSurvey, data);
     let stateData: StateData = initStateData();
-    let dataRemote: SurveyData;
 
     if (isChange) {
         data = saveQualityScore(idSurvey, data);
         if (!isDemoMode && isReviewerMode && !localSaveOnly && navigator.onLine) {
             stateData = getSurveyStateData(data, idSurvey);
             promisesToWait.push(
-                remotePutSurveyDataReviewer(idSurvey, stateData, data)
-                    .then(dataR => {
-                        dataRemote = dataR;
-                    })
-                    .catch(() => {
-                        //return Promise.reject({});
-                        //We ignore the error because user is stuck on EndSurveyPage if he couldn't submit in any moment his survey.
-                    }),
+                remotePutSurveyDataReviewer(idSurvey, stateData, data).catch(() => {
+                    //return Promise.reject({});
+                    //We ignore the error because user is stuck on EndSurveyPage if he couldn't submit in any moment his survey.
+                }),
             );
         }
         //We try to submit each time the local database is updated if the user is online
@@ -970,14 +967,10 @@ const saveData = (
                 data: data,
             };
             promisesToWait.push(
-                remotePutSurveyData(idSurvey, surveyData)
-                    .then(dataR => {
-                        dataRemote = dataR;
-                    })
-                    .catch(() => {
-                        //return Promise.reject({});
-                        //We ignore the error because user is stuck on EndSurveyPage if he couldn't submit in any moment his survey.
-                    }),
+                remotePutSurveyData(idSurvey, surveyData).catch(() => {
+                    //return Promise.reject({});
+                    //We ignore the error because user is stuck on EndSurveyPage if he couldn't submit in any moment his survey.
+                }),
             );
         } else if (isDemoMode || localSaveOnly) {
             stateData = getSurveyStateData(data, idSurvey);