diff --git a/orchestrator/activities/mongo_db.py b/orchestrator/activities/mongo_db.py
index d101658..d0256d0 100644
--- a/orchestrator/activities/mongo_db.py
+++ b/orchestrator/activities/mongo_db.py
@@ -242,7 +242,12 @@ class MongoDB(SientiaMonitoring):
             for pipeline in updated_pipelines
             if pipeline['success']
         ]
-        data_filter = {'$or': argument} if argument else {}
+        if not argument:
+            # Every update failed: stamp nothing so they are retried next tick (same guard as
+            # create_pipelines_timestamps). An empty filter would match every tracked schedule.
+            self.info('No successful pipeline updates to timestamp', metadata=metadata)
+            return
+        data_filter = {'$or': argument}
 
         try:
             self.mongo_db_repository.update_many(
@@ -343,7 +348,13 @@ class MongoDB(SientiaMonitoring):
             for pipeline in deleted_pipelines
             if pipeline['success']
         ]
-        data_filter = {'$or': argument} if argument else {}
+        if not argument:
+            # Every delete failed: remove nothing (same guard as create_pipelines_timestamps).
+            # An empty filter would wipe orchestrated_schedules and make the next tick delete
+            # and recreate every orchestrated schedule.
+            self.info('No successful pipeline deletions to untrack', metadata=metadata)
+            return
+        data_filter = {'$or': argument}
 
         try:
             self.mongo_db_repository.delete_many('orchestrated_schedules', data_filter, metadata)
diff --git a/tests/orchestrator/activities/test_mongo_db.py b/tests/orchestrator/activities/test_mongo_db.py
index e1496b1..8f82bb0 100644
--- a/tests/orchestrator/activities/test_mongo_db.py
+++ b/tests/orchestrator/activities/test_mongo_db.py
@@ -265,6 +265,22 @@ def test_update_pipelines_timestamps_success(now_mock, mongo_db):
     )
 
 
+@patch('orchestrator.activities.mongo_db.now')
+def test_update_pipelines_timestamps_all_failed_stamps_nothing(now_mock, mongo_db):
+    input_data = {
+        'updated_pipelines': [
+            {'schedule_name': 'test1', 'namespace': 'test1', 'success': False},
+        ]
+    }
+    mongo_db.mongo_db_repository.update_many = MagicMock()
+
+    mongo_db.update_pipelines_timestamps(input_data)
+
+    # An empty filter would match and stamp every tracked schedule, so the failed one
+    # would never be retried.
+    mongo_db.mongo_db_repository.update_many.assert_not_called()
+
+
 @patch('orchestrator.activities.mongo_db.now')
 def test_update_pipelines_timestamps_failure(now_mock, mongo_db):
     input_data = {
@@ -362,6 +378,21 @@ def test_delete_pipelines_timestamps_success(now_mock, mongo_db):
     )
 
 
+def test_delete_pipelines_timestamps_all_failed_deletes_nothing(mongo_db):
+    input_data = {
+        'deleted_pipelines': [
+            {'schedule_name': 'test1', 'namespace': 'test1', 'success': False},
+        ]
+    }
+    mongo_db.mongo_db_repository.delete_many = MagicMock()
+
+    mongo_db.delete_pipelines_timestamps(input_data)
+
+    # An empty filter would wipe orchestrated_schedules; the next tick's normalize_schedules
+    # would then delete and recreate every orchestrated Temporal schedule.
+    mongo_db.mongo_db_repository.delete_many.assert_not_called()
+
+
 @patch('orchestrator.activities.mongo_db.now')
 def test_delete_pipelines_timestamps_failure(now_mock, mongo_db):
     input_data = {