diff --git a/session.go b/session.go
index e0f5996..49c3461 100644
--- a/session.go
+++ b/session.go
@@ -16,9 +16,9 @@ type Session struct {
 }
 
 func (s *Session) writeMessage(message *envelope) {
-	if len(s.output) < s.melody.Config.MessageBufferSize {
-		s.output <- message
-	} else {
+	select {
+	case s.output <- message:
+	default:
 		s.melody.errorHandler(s, errors.New("Message buffer full"))
 	}
 }