diff --git a/src/client_builder.rs b/src/client_builder.rs
index a037b72..0e8e3ce 100644
--- a/src/client_builder.rs
+++ b/src/client_builder.rs
@@ -139,6 +139,12 @@ where
         };
 
         let tls = handshake(self.domain.as_ref(), tcp)?;
-        Ok(Client::new(tls))
+
+        let mut client = Client::new(tls);
+        if !self.starttls {
+            client.read_greeting()?;
+        }
+
+        Ok(client)
     }
 }