diff --git a/const.go b/const.go
index 7062231..5a5dee3 100644
--- a/const.go
+++ b/const.go
@@ -152,7 +152,7 @@ const (
 	// It's not an implementation choice, the value defined in the specification.
 	initialStreamWindow = 256 * 1024
 	maxStreamWindow     = 16 * 1024 * 1024
-	goAwayWaitTime      = 5 * time.Second
+	goAwayWaitTime      = 100 * time.Millisecond
 )
 
 const (
diff --git a/session.go b/session.go
index 204b168..8f1cdc1 100644
--- a/session.go
+++ b/session.go
@@ -290,7 +290,7 @@ func (s *Session) AcceptStream() (*Stream, error) {
 // semantics of the underlying net.Conn. For TCP connections, it may be dropped depending on LINGER value or
 // if there's unread data in the kernel receive buffer.
 func (s *Session) Close() error {
-	return s.close(ErrSessionShutdown, true, goAwayNormal)
+	return s.close(ErrSessionShutdown, false, goAwayNormal)
 }
 
 // CloseWithError is used to close the session and all streams after sending a GoAway message with errCode.