diff --git a/src/modules/07_insignia/components/2_Manage/listManage.vue b/src/modules/07_insignia/components/2_Manage/listManage.vue
index f20488a9f..835d18b88 100644
--- a/src/modules/07_insignia/components/2_Manage/listManage.vue
+++ b/src/modules/07_insignia/components/2_Manage/listManage.vue
@@ -259,19 +259,17 @@ async function backToEdit(reason: string) {
           }
         )
         .then(async () => {
-          success($q, "บันทึกสำเร็จ");
           await fecthInsigniaByOc(
             round.value,
             DataStore.agency,
             "officer",
             tab.value
           );
+          modalPopupBackToEdit.value = await false;
+          await success($q, "บันทึกสำเร็จ");
         })
         .catch((err) => {
           messageError($q, err);
-        })
-        .finally(() => {
-          modalPopupBackToEdit.value = false;
           hideLoader();
         });
     },