diff --git a/serverconn.go b/serverconn.go
index 52e9bdf8..4dca99e3 100644
--- a/serverconn.go
+++ b/serverconn.go
@@ -61,6 +61,9 @@ type ServerConn struct {
 
 	// in
 	sessionRemove chan *ServerSession
+
+	// out
+	done chan struct{}
 }
 
 func newServerConn(
@@ -75,6 +78,7 @@ func newServerConn(
 		ctx:           ctx,
 		ctxCancel:     ctxCancel,
 		sessionRemove: make(chan *ServerSession),
+		done:          make(chan struct{}),
 	}
 
 	s.wg.Add(1)
@@ -104,6 +108,7 @@ func (sc *ServerConn) zone() string {
 
 func (sc *ServerConn) run() {
 	defer sc.s.wg.Done()
+	defer close(sc.done)
 
 	if h, ok := sc.s.Handler.(ServerHandlerOnConnOpen); ok {
 		h.OnConnOpen(&ServerHandlerOnConnOpenCtx{
diff --git a/serversession.go b/serversession.go
index 6eeb506f..47d3740b 100644
--- a/serversession.go
+++ b/serversession.go
@@ -332,6 +332,9 @@ func (ss *ServerSession) run() {
 	for sc := range ss.conns {
 		if sc == ss.tcpConn {
 			sc.Close()
+
+			// make sure that OnFrame() is never called after OnSessionClose()
+			<-sc.done
 		}
 
 		select {