diff --git a/src/main/java/uk/gov/hmcts/reform/adoption/adoptioncase/event/SystemUpdateApplication.java b/src/main/java/uk/gov/hmcts/reform/adoption/adoptioncase/event/SystemUpdateApplication.java
index 6ded9c446..85e7bc493 100644
--- a/src/main/java/uk/gov/hmcts/reform/adoption/adoptioncase/event/SystemUpdateApplication.java
+++ b/src/main/java/uk/gov/hmcts/reform/adoption/adoptioncase/event/SystemUpdateApplication.java
@@ -2,7 +2,9 @@
 
 import org.springframework.stereotype.Component;
 import uk.gov.hmcts.ccd.sdk.api.CCDConfig;
+import uk.gov.hmcts.ccd.sdk.api.CaseDetails;
 import uk.gov.hmcts.ccd.sdk.api.ConfigBuilder;
+import uk.gov.hmcts.ccd.sdk.api.callback.AboutToStartOrSubmitResponse;
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.CaseData;
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.State;
 import uk.gov.hmcts.reform.adoption.adoptioncase.model.UserRole;
@@ -28,7 +30,19 @@ public void configure(final ConfigBuilder<CaseData, State, UserRole> configBuild
             .name("Adoption case")
             .description("Adoption application update by system")
             .retries(120, 120)
+            .aboutToSubmitCallback(this::aboutToSubmit)
             .grant(CREATE_READ_UPDATE, SYSTEM_UPDATE)
             .grant(READ, SUPER_USER);
     }
+
+    public AboutToStartOrSubmitResponse<CaseData, State> aboutToSubmit(
+        final CaseDetails<CaseData, State> details,
+        final CaseDetails<CaseData, State> beforeDetails) {
+
+        return AboutToStartOrSubmitResponse.<CaseData, State>builder()
+            .data(details.getData())
+            .state(details.getData().getStatus())
+            .build();
+    }
+
 }