diff --git a/server/src/workflow-management/integrations/airtable.ts b/server/src/workflow-management/integrations/airtable.ts
index 5f72c836..e1f27264 100644
--- a/server/src/workflow-management/integrations/airtable.ts
+++ b/server/src/workflow-management/integrations/airtable.ts
@@ -454,33 +454,36 @@ function isValidUrl(str: string): boolean {
 }
 
 export const processAirtableUpdates = async () => {
-  while (true) {
+  const maxProcessingTime = 60000;
+  const startTime = Date.now();
+
+  while (Date.now() - startTime < maxProcessingTime) {
     let hasPendingTasks = false;
-    
+
     for (const runId in airtableUpdateTasks) {
       const task = airtableUpdateTasks[runId];
-      
+
       if (task.status === 'pending') {
         hasPendingTasks = true;
         console.log(`Processing Airtable update for run: ${runId}`);
-        
+
         try {
           await updateAirtable(task.robotId, task.runId);
           console.log(`Successfully updated Airtable for runId: ${runId}`);
-          airtableUpdateTasks[runId].status = 'completed';
-          delete airtableUpdateTasks[runId]; 
+          delete airtableUpdateTasks[runId];
         } catch (error: any) {
           console.error(`Failed to update Airtable for run ${task.runId}:`, error);
-          
+
           if (task.retries < MAX_RETRIES) {
             airtableUpdateTasks[runId].retries += 1;
             console.log(`Retrying task for runId: ${runId}, attempt: ${task.retries + 1}`);
           } else {
-            airtableUpdateTasks[runId].status = 'failed';
-            console.log(`Max retries reached for runId: ${runId}. Marking task as failed.`);
-            logger.log('error', `Permanent failure for run ${runId}: ${error.message}`);
+            console.log(`Max retries reached for runId: ${runId}. Removing task.`);
+            delete airtableUpdateTasks[runId];
           }
         }
+      } else if (task.status === 'completed' || task.status === 'failed') {
+        delete airtableUpdateTasks[runId];
       }
     }
 
@@ -488,8 +491,10 @@ export const processAirtableUpdates = async () => {
       console.log('No pending Airtable update tasks, exiting processor');
       break;
     }
-    
+
     console.log('Waiting for 5 seconds before checking again...');
     await new Promise(resolve => setTimeout(resolve, 5000));
   }
+
+  console.log('Airtable processing completed or timed out');
 };
\ No newline at end of file
diff --git a/server/src/workflow-management/integrations/gsheet.ts b/server/src/workflow-management/integrations/gsheet.ts
index 2a29bdcc..fcf9b95c 100644
--- a/server/src/workflow-management/integrations/gsheet.ts
+++ b/server/src/workflow-management/integrations/gsheet.ts
@@ -286,8 +286,12 @@ export async function writeDataToSheet(
 }
 
 export const processGoogleSheetUpdates = async () => {
-  while (true) {
+  const maxProcessingTime = 60000;
+  const startTime = Date.now();
+
+  while (Date.now() - startTime < maxProcessingTime) {
     let hasPendingTasks = false;
+
     for (const runId in googleSheetUpdateTasks) {
       const task = googleSheetUpdateTasks[runId];
       console.log(`Processing task for runId: ${runId}, status: ${task.status}`);
@@ -297,7 +301,6 @@ export const processGoogleSheetUpdates = async () => {
         try {
           await updateGoogleSheet(task.robotId, task.runId);
           console.log(`Successfully updated Google Sheet for runId: ${runId}`);
-          googleSheetUpdateTasks[runId].status = 'completed';
           delete googleSheetUpdateTasks[runId];
         } catch (error: any) {
           console.error(`Failed to update Google Sheets for run ${task.runId}:`, error);
@@ -305,10 +308,12 @@ export const processGoogleSheetUpdates = async () => {
             googleSheetUpdateTasks[runId].retries += 1;
             console.log(`Retrying task for runId: ${runId}, attempt: ${task.retries}`);
           } else {
-            googleSheetUpdateTasks[runId].status = 'failed';
-            console.log(`Max retries reached for runId: ${runId}. Marking task as failed.`);
+            console.log(`Max retries reached for runId: ${runId}. Removing task.`);
+            delete googleSheetUpdateTasks[runId];
           }
         }
+      } else if (task.status === 'completed' || task.status === 'failed') {
+        delete googleSheetUpdateTasks[runId];
       }
     }
 
@@ -320,4 +325,6 @@ export const processGoogleSheetUpdates = async () => {
     console.log('Waiting for 5 seconds before checking again...');
     await new Promise(resolve => setTimeout(resolve, 5000));
   }
+
+  console.log('Google Sheets processing completed or timed out');
 };
\ No newline at end of file