diff --git a/lib/service_request_latest/service_request_detail_provider.dart b/lib/service_request_latest/service_request_detail_provider.dart
index 90da16a5..ffaca293 100644
--- a/lib/service_request_latest/service_request_detail_provider.dart
+++ b/lib/service_request_latest/service_request_detail_provider.dart
@@ -18,6 +18,8 @@ import 'package:test_sa/models/service_request/supplier_details.dart';
 class ServiceRequestDetailProvider extends ChangeNotifier {
   final pageItemNumber = 10;
 
+  int lastVisitedRequestActivityId = -1;
+
   void reset() {
     nextPage = true;
     stateCode = null;
diff --git a/lib/service_request_latest/views/components/activities_list_view.dart b/lib/service_request_latest/views/components/activities_list_view.dart
index 126b3bfa..81e8cc4e 100644
--- a/lib/service_request_latest/views/components/activities_list_view.dart
+++ b/lib/service_request_latest/views/components/activities_list_view.dart
@@ -68,6 +68,7 @@ class _ActivitiesListViewState extends State<ActivitiesListView> {
       //backgroundColor: const Color(0xfff8f9fb),
       body: Consumer<ServiceRequestDetailProvider>(builder: (context, ServiceRequestDetailProvider requestDetailProvider, child) {
         activities = requestDetailProvider.currentWorkOrder!.data!.activities;
+        requestDetailProvider.lastVisitedRequestActivityId =  (activities.isNotEmpty?  activities.last.id :-1)!;
         if (activities.isNotEmpty && (activities.last.activityStatus!.value == 14 || activities.last.activityStatus!.value == 19)) {
           disableNewActivity = true;
         } else {
diff --git a/lib/service_request_latest/views/forms/maintenance_request/components/internal_request.dart b/lib/service_request_latest/views/forms/maintenance_request/components/internal_request.dart
index 137a85bc..0be65a4b 100644
--- a/lib/service_request_latest/views/forms/maintenance_request/components/internal_request.dart
+++ b/lib/service_request_latest/views/forms/maintenance_request/components/internal_request.dart
@@ -5,7 +5,6 @@ import 'package:test_sa/extensions/context_extension.dart';
 import 'package:test_sa/extensions/int_extensions.dart';
 import 'package:test_sa/extensions/text_extensions.dart';
 import 'package:test_sa/extensions/widget_extensions.dart';
-import 'package:test_sa/models/timer_model.dart';
 import 'package:test_sa/new_views/app_style/app_color.dart';
 import 'package:test_sa/providers/service_request_providers/last_situation_provider.dart';
 import 'package:test_sa/service_request_latest/service_request_detail_provider.dart';
@@ -57,6 +56,11 @@ class _InternalMaintenanceRequestState extends State<InternalMaintenanceRequest>
       double totalWorkingHours = _requestDetailProvider?.activityMaintenanceHelperModel?.activityMaintenanceTimers
               ?.fold(0.0, (sum, item) => (sum ?? 0) + DateTime.parse(item.endTime!).difference(DateTime.parse(item.startTime!)).inSeconds) ??
           0;
+
+      bool enableTimer = (requestDetailProvider.lastVisitedRequestActivityId == -1 || requestDetailProvider.activityMaintenanceHelperModel?.id == 0)
+          ? true
+          : requestDetailProvider.activityMaintenanceHelperModel?.id == requestDetailProvider.lastVisitedRequestActivityId;
+
       return SingleChildScrollView(
         child: Column(
           children: [
@@ -97,7 +101,7 @@ class _InternalMaintenanceRequestState extends State<InternalMaintenanceRequest>
                   AppTimer(
                     label: context.translation.timer,
                     timer: requestDetailProvider.activityMaintenanceHelperModel?.activityMaintenanceTimerModel,
-                    //  enabled: requestDetailProvider.activityMaintenanceHelperModel?.activityMaintenanceTimerModel?.endAt == null,
+                    enabled: enableTimer,
                     timerProgress: (isRunning) {
                       print("timerProgress:$isRunning");
                     },