diff --git a/app/cli/automate.py b/app/cli/automate.py
index bd22db6..6c01499 100644
--- a/app/cli/automate.py
+++ b/app/cli/automate.py
@@ -152,7 +152,11 @@ def run_job(job_cls: Type[BaseAutomation], *,
             shutil.rmtree(working_dir)
     else:
         automation.state = AutomationState.ERROR
-        automation.enabled = False
+        safe_jobs = [
+                "proxy_cloudfront", "static_aws", "list_http_post", "list_s3", "list_github", "list_gitlab"
+                ]
+        if job.short_name not in safe_jobs:
+            automation.enabled = False
         automation.next_run = None
         log = AutomationLogs()
         log.automation_id = automation.id