diff --git a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCapturePresenterImpl.kt b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCapturePresenterImpl.kt
index 13143e3f3b2..fe94d418675 100644
--- a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCapturePresenterImpl.kt
+++ b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCapturePresenterImpl.kt
@@ -133,6 +133,7 @@ class EventCapturePresenterImpl(
                     canComplete,
                     onCompleteMessage,
                     canSkipErrorFix,
+                    eventStatus,
                 )
 
                 if (eventStatus == EventStatus.COMPLETED && eventCompletionDialog.fieldsWithIssues.isEmpty()) {
diff --git a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/domain/ConfigureEventCompletionDialog.kt b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/domain/ConfigureEventCompletionDialog.kt
index 3543b4641b0..7e6a53f935d 100644
--- a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/domain/ConfigureEventCompletionDialog.kt
+++ b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/domain/ConfigureEventCompletionDialog.kt
@@ -15,6 +15,7 @@ import org.dhis2.usescases.eventsWithoutRegistration.eventCapture.model.EventCom
 import org.dhis2.usescases.eventsWithoutRegistration.eventCapture.model.EventCompletionDialog
 import org.dhis2.usescases.eventsWithoutRegistration.eventCapture.provider.EventCaptureResourcesProvider
 import org.dhis2.utils.customviews.FormBottomDialog
+import org.hisp.dhis.android.core.event.EventStatus
 
 class ConfigureEventCompletionDialog(
     val provider: EventCaptureResourcesProvider,
@@ -27,6 +28,7 @@ class ConfigureEventCompletionDialog(
         canComplete: Boolean,
         onCompleteMessage: String?,
         canSkipErrorFix: Boolean,
+        eventState: EventStatus,
     ): EventCompletionDialog {
         val dialogType = getDialogType(
             errorFields,
@@ -34,10 +36,10 @@ class ConfigureEventCompletionDialog(
             warningFields,
             !canComplete && onCompleteMessage != null,
         )
-        val mainButton = getMainButton(dialogType)
-        val secondaryButton = if (canSkipErrorFix) {
+        val mainButton = getMainButton(dialogType, eventState)
+        val secondaryButton = if (canSkipErrorFix || eventState == EventStatus.COMPLETED) {
             EventCompletionButtons(
-                SecondaryButton(provider.provideNotNow()),
+                SecondaryButton(if (eventState == EventStatus.COMPLETED) provider.provideSaveAnyway() else provider.provideNotNow()),
                 FormBottomDialog.ActionType.FINISH,
             )
         } else {
@@ -45,7 +47,7 @@ class ConfigureEventCompletionDialog(
         }
         val bottomSheetDialogUiModel = BottomSheetDialogUiModel(
             title = getTitle(dialogType),
-            message = getSubtitle(dialogType),
+            message = getSubtitle(dialogType, eventState),
             iconResource = getIcon(dialogType),
             mainButton = mainButton.buttonStyle,
             secondaryButton = secondaryButton?.buttonStyle,
@@ -69,10 +71,10 @@ class ConfigureEventCompletionDialog(
         else -> provider.provideSavedText()
     }
 
-    private fun getSubtitle(type: DialogType) = when (type) {
+    private fun getSubtitle(type: DialogType, eventState: EventStatus) = when (type) {
         ERROR -> provider.provideErrorInfo()
         MANDATORY -> provider.provideMandatoryInfo()
-        WARNING -> provider.provideWarningInfo()
+        WARNING -> if (eventState == EventStatus.COMPLETED) provider.provideWarningInfoCompletedEvent() else provider.provideWarningInfo()
         SUCCESSFUL -> provider.provideCompleteInfo()
         COMPLETE_ERROR -> provider.provideOnCompleteErrorInfo()
     }
@@ -84,7 +86,7 @@ class ConfigureEventCompletionDialog(
         SUCCESSFUL -> provider.provideSavedIcon()
     }
 
-    private fun getMainButton(type: DialogType) = when (type) {
+    private fun getMainButton(type: DialogType, eventState: EventStatus) = when (type) {
         ERROR,
         MANDATORY,
         COMPLETE_ERROR,
@@ -93,7 +95,17 @@ class ConfigureEventCompletionDialog(
             FormBottomDialog.ActionType.CHECK_FIELDS,
         )
 
-        WARNING,
+        WARNING -> if (eventState == EventStatus.COMPLETED) {
+            EventCompletionButtons(
+                MainButton(provider.provideReview()),
+                FormBottomDialog.ActionType.CHECK_FIELDS,
+            )
+        } else {
+            EventCompletionButtons(
+                CompleteButton,
+                FormBottomDialog.ActionType.COMPLETE,
+            )
+        }
         SUCCESSFUL,
         -> EventCompletionButtons(
             CompleteButton,
diff --git a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/provider/EventCaptureResourcesProvider.kt b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/provider/EventCaptureResourcesProvider.kt
index 439a3c8ee6d..34fa0910c71 100644
--- a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/provider/EventCaptureResourcesProvider.kt
+++ b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/provider/EventCaptureResourcesProvider.kt
@@ -25,10 +25,14 @@ class EventCaptureResourcesProvider(
 
     fun provideWarningInfo() = resourceManager.getString(R.string.missing_warning_fields_events)
 
+    fun provideWarningInfoCompletedEvent() = resourceManager.getString(R.string.missing_warning_fields_completed_events)
+
     fun provideReview() = R.string.review
 
     fun provideNotNow() = R.string.not_now
 
+    fun provideSaveAnyway() = R.string.save_anyway
+
     fun provideCompleteInfo() = resourceManager.getString(R.string.event_can_be_completed)
 
     fun provideOnCompleteErrorInfo() = resourceManager.getString(R.string.event_error_on_complete)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 63608905d26..2486c2bc8ba 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -863,6 +863,7 @@
     <string name="action_ok">Ok</string>
     <string name="init_search">Start a search to find any %s</string>
     <string name="search_or_create">You can search or create a new %s</string>
+    <string name="missing_warning_fields_completed_events">You have some warning messages.</string>
     <string name="missing_warning_fields_events">You have some warning messages.\nDo you want to mark this form as complete?</string>
     <string name="missing_error_fields_events">Some fields have errors and they are not saved. \nDo you want to review the form?</string>
     <string name="event_can_be_completed">Do you want to mark this form as complete?</string>
diff --git a/app/src/test/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCapturePresenterTest.kt b/app/src/test/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCapturePresenterTest.kt
index 0d16a9ae8be..b32e1a15344 100644
--- a/app/src/test/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCapturePresenterTest.kt
+++ b/app/src/test/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCapturePresenterTest.kt
@@ -258,7 +258,10 @@ class EventCapturePresenterTest {
         ) doReturn ValidationStrategy.ON_UPDATE_AND_INSERT
         val eventCompletionDialog: EventCompletionDialog = mock()
         whenever(
-            configureEventCompletionDialog.invoke(emptyList(), emptyMap(), emptyList(), true, null, false),
+            configureEventCompletionDialog.invoke(
+                emptyList(), emptyMap(), emptyList(), true, null, false,
+                EventStatus.COMPLETED,
+            ),
         ) doReturn eventCompletionDialog
         whenever(eventRepository.isCompletedEventExpired(any())) doReturn Observable.just(true)
         whenever(eventRepository.isEventEditable(any())) doReturn true
@@ -281,7 +284,7 @@ class EventCapturePresenterTest {
         ) doReturn ValidationStrategy.ON_UPDATE_AND_INSERT
         val eventCompletionDialog: EventCompletionDialog = mock()
         whenever(
-            configureEventCompletionDialog.invoke(emptyList(), emptyMap(), emptyList(), true, null, false),
+            configureEventCompletionDialog.invoke(emptyList(), emptyMap(), emptyList(), true, null, false, EventStatus.COMPLETED),
         ) doReturn eventCompletionDialog
         whenever(eventRepository.isCompletedEventExpired(any())) doReturn Observable.just(false)
         whenever(eventRepository.isEventEditable(any())) doReturn true
@@ -338,7 +341,7 @@ class EventCapturePresenterTest {
         ) doReturn ValidationStrategy.ON_UPDATE_AND_INSERT
         val eventCompletionDialog: EventCompletionDialog = mock()
         whenever(
-            configureEventCompletionDialog.invoke(any(), any(), any(), any(), any(), any()),
+            configureEventCompletionDialog.invoke(any(), any(), any(), any(), any(), any(), any()),
         ) doReturn eventCompletionDialog
         whenever(
             eventRepository.isEnrollmentOpen,
@@ -368,7 +371,7 @@ class EventCapturePresenterTest {
         ) doReturn ValidationStrategy.ON_UPDATE_AND_INSERT
         val eventCompletionDialog = EventCompletionDialog(mock(), mock(), null, listOf(FieldWithIssue("uid", "fieldName", mock(), "message")))
         whenever(
-            configureEventCompletionDialog.invoke(any(), any(), any(), any(), any(), any()),
+            configureEventCompletionDialog.invoke(any(), any(), any(), any(), any(), any(), any()),
         ) doReturn eventCompletionDialog
         whenever(
             eventRepository.isEnrollmentOpen,
@@ -398,7 +401,7 @@ class EventCapturePresenterTest {
         ) doReturn ValidationStrategy.ON_UPDATE_AND_INSERT
         val eventCompletionDialog: EventCompletionDialog = mock()
         whenever(
-            configureEventCompletionDialog.invoke(any(), any(), any(), any(), any(), any()),
+            configureEventCompletionDialog.invoke(any(), any(), any(), any(), any(), any(), any()),
         ) doReturn eventCompletionDialog
         whenever(
             eventRepository.isEnrollmentOpen,
diff --git a/app/src/test/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/domain/ConfigureEventCompletionDialogTest.kt b/app/src/test/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/domain/ConfigureEventCompletionDialogTest.kt
index 3c151bb86f5..a7b65bd7095 100644
--- a/app/src/test/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/domain/ConfigureEventCompletionDialogTest.kt
+++ b/app/src/test/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/domain/ConfigureEventCompletionDialogTest.kt
@@ -3,6 +3,7 @@ package org.dhis2.usescases.eventsWithoutRegistration.eventCapture.domain
 import org.dhis2.ui.dialogs.bottomsheet.FieldWithIssue
 import org.dhis2.ui.dialogs.bottomsheet.IssueType
 import org.dhis2.usescases.eventsWithoutRegistration.eventCapture.provider.EventCaptureResourcesProvider
+import org.hisp.dhis.android.core.event.EventStatus
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
@@ -56,6 +57,7 @@ class ConfigureEventCompletionDialogTest {
             canComplete = true,
             onCompleteMessage = null,
             canSkipErrorFix = true,
+            EventStatus.ACTIVE,
         )
 
         // Then Dialog should has Error info
@@ -79,6 +81,7 @@ class ConfigureEventCompletionDialogTest {
             canComplete = true,
             onCompleteMessage = null,
             canSkipErrorFix = true,
+            EventStatus.ACTIVE,
         )
 
         // Then Dialog should has Error info
@@ -101,6 +104,7 @@ class ConfigureEventCompletionDialogTest {
             canComplete = true,
             onCompleteMessage = null,
             canSkipErrorFix = true,
+            EventStatus.ACTIVE,
         )
 
         // Then Dialog should has Error info
@@ -121,6 +125,7 @@ class ConfigureEventCompletionDialogTest {
             canComplete = true,
             onCompleteMessage = null,
             canSkipErrorFix = true,
+            EventStatus.ACTIVE,
         )
 
         // Then Dialog should has Error info
@@ -141,6 +146,7 @@ class ConfigureEventCompletionDialogTest {
             canComplete = true,
             onCompleteMessage = WARNING_MESSAGE,
             canSkipErrorFix = true,
+            EventStatus.ACTIVE,
         )
 
         // Then Dialog should has Error info
@@ -161,6 +167,7 @@ class ConfigureEventCompletionDialogTest {
             canComplete = false,
             onCompleteMessage = ERROR_INFO,
             canSkipErrorFix = true,
+            EventStatus.ACTIVE,
         )
 
         // Then Dialog should has Error info
diff --git a/form/src/main/res/values/strings.xml b/form/src/main/res/values/strings.xml
index 88ca0e3b247..75eada1571c 100644
--- a/form/src/main/res/values/strings.xml
+++ b/form/src/main/res/values/strings.xml
@@ -58,6 +58,7 @@
     <string name="saved">Saved!</string>
     <string name="review_message">Some fields need your attention.\nDo you want to review the form?</string>
     <string name="not_now">Not now</string>
+    <string name="save_anyway">Save anyway</string>
     <string name="keep_editing">Keep editing</string>
     <string name="discard_go_back">If you exit now all the information in the form will be discarded.</string>
     <string name="field_errors_not_saved_discard">Some fields have errors and they are not saved. \nIf you exit now the changes will be discarded.</string>