diff --git a/lib/views/pages/user/ppm/ppm_work_order/recurrent_wo/recurrent_work_order_view.dart b/lib/views/pages/user/ppm/ppm_work_order/recurrent_wo/recurrent_work_order_view.dart
index 8b3eb979..19574b31 100644
--- a/lib/views/pages/user/ppm/ppm_work_order/recurrent_wo/recurrent_work_order_view.dart
+++ b/lib/views/pages/user/ppm/ppm_work_order/recurrent_wo/recurrent_work_order_view.dart
@@ -48,7 +48,12 @@ class _RecurrentWorkOrderViewState extends State<RecurrentWorkOrderView> {
   Widget build(BuildContext context) {
     return Consumer<AllRequestsProvider>(builder: (context, requestProvider, child) {
       return Scaffold(
-        appBar: DefaultAppBar(title: context.translation.recurrentWo),
+        appBar: DefaultAppBar(
+          title: context.translation.recurrentWo,
+          onWillPopScope: () {
+            _updateTask(context: context, status: 0);
+          },
+        ),
         body: allRequestsProvider!.isLoading
             ? const ALoading()
             : requestProvider.recurrentWoData != null
@@ -94,7 +99,9 @@ class _RecurrentWorkOrderViewState extends State<RecurrentWorkOrderView> {
                     ],
                   )
                 : NoDataFound(message: context.translation.noDataFound).center,
-      );
+      ).handlePopScope(context, () {
+        _updateTask(context: context, status: 0);
+      });
     });
   }
 }
diff --git a/lib/views/pages/user/ppm/update_ppm/update_ppm.dart b/lib/views/pages/user/ppm/update_ppm/update_ppm.dart
index dc78915c..839a6090 100644
--- a/lib/views/pages/user/ppm/update_ppm/update_ppm.dart
+++ b/lib/views/pages/user/ppm/update_ppm/update_ppm.dart
@@ -1,5 +1,4 @@
 import 'dart:convert';
-import 'dart:developer';
 
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
@@ -9,7 +8,6 @@ import 'package:test_sa/extensions/context_extension.dart';
 import 'package:test_sa/extensions/int_extensions.dart';
 import 'package:test_sa/extensions/string_extensions.dart';
 import 'package:test_sa/extensions/widget_extensions.dart';
-import 'package:test_sa/models/all_requests_and_count_model.dart';
 import 'package:test_sa/models/plan_preventive_visit/plan_preventive_visit_model.dart';
 import 'package:test_sa/models/ppm/ppm.dart';
 import 'package:test_sa/new_views/app_style/app_color.dart';
@@ -44,8 +42,7 @@ class _UpdatePpmState extends State<UpdatePpm> with TickerProviderStateMixin {
   late PpmProvider ppmProvider;
 
   _onSubmit({required int status}) async {
-
-    if(ppmProvider.validate()){
+    if (ppmProvider.validate()) {
       showDialog(context: context, barrierDismissible: false, builder: (context) => const AppLazyLoading());
       ppmProvider.planPreventiveVisit?.preventiveVisitAttachments = [];
       for (var item in ppmProvider.ppmPlanAttachments) {
@@ -67,7 +64,7 @@ class _UpdatePpmState extends State<UpdatePpm> with TickerProviderStateMixin {
       });
 
       await ppmProvider.updateVisitByEngineer(status: status).whenComplete(() {
-        if(status==1){
+        if (status == 1) {
           AllRequestsProvider allRequestsProvider = Provider.of<AllRequestsProvider>(context, listen: false);
           allRequestsProvider.reset();
           allRequestsProvider.getAllRequests(context, typeTransaction: 4);
@@ -78,8 +75,6 @@ class _UpdatePpmState extends State<UpdatePpm> with TickerProviderStateMixin {
         Navigator.pop(context);
       });
     }
-
-
   }
 
   @override
@@ -115,7 +110,12 @@ class _UpdatePpmState extends State<UpdatePpm> with TickerProviderStateMixin {
   Widget build(BuildContext context) {
     return Scaffold(
       backgroundColor: AppColor.neutral110,
-      appBar: DefaultAppBar(title: context.translation.preventiveMaintenance),
+      appBar: DefaultAppBar(
+        title: context.translation.preventiveMaintenance,
+        onWillPopScope: () {
+          _onSubmit(status: 0);
+        },
+      ),
       key: _scaffoldKey,
       body: SafeArea(
         child: Column(
@@ -212,6 +212,8 @@ class _UpdatePpmState extends State<UpdatePpm> with TickerProviderStateMixin {
           ],
         ),
       ),
-    );
+    ).handlePopScope(context, () {
+      _onSubmit(status: 0);
+    });
   }
 }