diff --git a/apps/accounts/api/automations/change_secret.py b/apps/accounts/api/automations/change_secret.py
index ab1707f8d..6fe20a746 100644
--- a/apps/accounts/api/automations/change_secret.py
+++ b/apps/accounts/api/automations/change_secret.py
@@ -75,11 +75,12 @@ class ChangeSecretRecordViewSet(mixins.ListModelMixin, OrgGenericViewSet):
             date_finished=Subquery(
                 recent_dates.filter(account=OuterRef('account')).values('max_date_finished')[:1]
             )
-        ).filter(Q(status=ChangeSecretRecordStatusChoice.success) | Q(ignore_fail=True))
+        ).filter(Q(status=ChangeSecretRecordStatusChoice.success))
 
         failed_records = queryset.filter(
             ~Q(account__in=Subquery(recent_success_accounts.values('account'))),
-            status=ChangeSecretRecordStatusChoice.failed
+            status=ChangeSecretRecordStatusChoice.failed,
+            ignore_fail=False
         )
         return failed_records
 
diff --git a/apps/accounts/automations/base/manager.py b/apps/accounts/automations/base/manager.py
index 9c0130d52..ab17a2c77 100644
--- a/apps/accounts/automations/base/manager.py
+++ b/apps/accounts/automations/base/manager.py
@@ -144,7 +144,7 @@ class BaseChangeSecretPushManager(AccountBasePlaybookManager):
 
             if exist:
                 print(f"Data inserted, updating recorder status after {attempt + 1}th query")
-                recorder.save(update_fields=['status', 'date_finished'])
+                recorder.save(update_fields=['error', 'status', 'date_finished'])
                 return True
 
             print(f"Data not ready, waiting {retry_interval} second(s) and retrying ({attempt + 1}/{max_retries})")