diff --git a/config/postal.defaults.yml b/config/postal.defaults.yml
index b0ab42b..aa8032f 100644
--- a/config/postal.defaults.yml
+++ b/config/postal.defaults.yml
@@ -120,3 +120,7 @@ clamav:
   enabled: false
   host: 127.0.0.1
   port: 2000
+
+smtp_client:
+  open_timeout: 30
+  read_timeout: 60
diff --git a/lib/postal/smtp_sender.rb b/lib/postal/smtp_sender.rb
index 3991c8c..ede2b2b 100644
--- a/lib/postal/smtp_sender.rb
+++ b/lib/postal/smtp_sender.rb
@@ -47,6 +47,8 @@ module Postal
               next
             end
             smtp_client = Net::SMTP.new(hostname, port)
+            smtp_client.open_timeout = Postal.config.smtp_client.open_timeout
+            smtp_client.read_timeout = Postal.config.smtp_client.read_timeout
             if @source_ip_address
               # Set the source IP as appropriate
               smtp_client.source_address = ip_type == :aaaa ? @source_ip_address.ipv6 : @source_ip_address.ipv4