diff --git a/services/web/app/coffee/Features/Email/EmailSender.coffee b/services/web/app/coffee/Features/Email/EmailSender.coffee
index b4b3954d31..680d7708c3 100644
--- a/services/web/app/coffee/Features/Email/EmailSender.coffee
+++ b/services/web/app/coffee/Features/Email/EmailSender.coffee
@@ -35,6 +35,7 @@ module.exports =
 			subject: options.subject
 			html: options.html
 			replyTo: options.replyTo || Settings.email.replyToAddress
+			socketTimeout: 30 * 1000
 		client.sendMail options, (err, res)->
 			if err?
 				logger.err err:err, "error sending message"
diff --git a/services/web/app/coffee/Features/Newsletter/NewsletterManager.coffee b/services/web/app/coffee/Features/Newsletter/NewsletterManager.coffee
index 00297f7e67..8d7eee43bf 100644
--- a/services/web/app/coffee/Features/Newsletter/NewsletterManager.coffee
+++ b/services/web/app/coffee/Features/Newsletter/NewsletterManager.coffee
@@ -33,4 +33,5 @@ buildOptions = (user, is_subscribed)->
 			subscriber_list_id: Settings.markdownmail.list_id
 			is_subscribed: is_subscribed
 		url: "https://www.markdownmail.io/lists/subscribe"
+		timeout: 30 * 1000
 	return options
\ No newline at end of file