diff --git a/src/olympia/amo/tasks.py b/src/olympia/amo/tasks.py
index 108e2094a0e..0dd7fb9852d 100644
--- a/src/olympia/amo/tasks.py
+++ b/src/olympia/amo/tasks.py
@@ -16,7 +16,7 @@
 log = olympia.core.logger.getLogger('z.task')
 
 
-@task
+@task(autoretry_for=Exception)
 def send_email(recipient, subject, message, from_email=None,
                html_message=None, attachments=None, real_email=False,
                cc=None, headers=None, max_retries=3, reply_to=None,
@@ -35,7 +35,6 @@ def send_email(recipient, subject, message, from_email=None,
         return True
     except Exception as e:
         log.exception('send_mail() failed with error: %s, retrying' % e)
-        return send_email.retry(exc=e, max_retries=max_retries)
 
 
 @task