diff --git a/orchestrator/activities/email.py b/orchestrator/activities/email.py
index 2542066..c5c4400 100644
--- a/orchestrator/activities/email.py
+++ b/orchestrator/activities/email.py
@@ -30,7 +30,7 @@ class Email(BaseActivity):
 
         logger.info(f"Initializing Email with {smtp_server}:{smtp_port}")
 
-        self.server = smtplib.SMTP(smtp_server, smtp_port)
+        self.server = smtplib.SMTP(smtp_server, smtp_port, timeout=20)
 
         if self.sender_password:
             self.server.starttls()
@@ -123,7 +123,8 @@ class Email(BaseActivity):
                     self.logger.error(f"Failed to quit server: {e}")
                     raise e
 
-            self.server = smtplib.SMTP(self.smtp_server, self.smtp_port)
+            self.server = smtplib.SMTP(
+                self.smtp_server, self.smtp_port, timeout=20)
             self.server.starttls()
             self.server.login(self.sender_email, self.sender_password)
             self.server.sendmail(self.sender_email, receivers, msg.as_string())