Merge commit '74976a8e4' into dinsic

1 files changed, 2 insertions, 1 deletions

diff --git a/synapse/handlers/account_validity.py b/synapse/handlers/account_validity.py

index 764ec1d8ca..61740df34c 100644
--- a/synapse/handlers/account_validity.py
+++ b/synapse/handlers/account_validity.py
@@ -80,7 +80,8 @@ class AccountValidityHandler:
                     "send_renewals", self._send_renewal_emails
                 )
 
-            self.clock.looping_call(send_emails, 30 * 60 * 1000)
+            if hs.config.run_background_tasks:
+                self.clock.looping_call(send_emails, 30 * 60 * 1000)
 
         # Mark users as inactive when they expired. Check once every hour
         if self._account_validity_enabled: