diff --git a/conn.go b/conn.go
index b42b1a6..18b61df 100644
--- a/conn.go
+++ b/conn.go
@@ -741,6 +741,10 @@ func (c *Conn) Handshake() Alert {
 		c.hState = state
 		logf(logTypeHandshake, "state is now %s", c.GetHsState())
 		_, connected = state.(StateConnected)
+
+		if c.config.NonBlocking && alert == AlertStatelessRetry {
+			return AlertStatelessRetry
+		}
 	}
 
 	c.state = state.(StateConnected)