diff --git a/lib/postal/smtp_server/server.rb b/lib/postal/smtp_server/server.rb
index 4cd5d46..23ed570 100644
--- a/lib/postal/smtp_server/server.rb
+++ b/lib/postal/smtp_server/server.rb
@@ -142,7 +142,7 @@ module Postal
                   else
                     buffers[io] << io.readpartial(10240)
                   end
-                rescue EOFError, Errno::ECONNRESET
+                rescue EOFError, Errno::ECONNRESET, Errno::ETIMEDOUT
                   # Client went away
                   eof = true
                 end