diff --git a/serverconn.go b/serverconn.go
index 3bd84cb9..c494e438 100644
--- a/serverconn.go
+++ b/serverconn.go
@@ -476,7 +476,7 @@ func (sc *ServerConn) handleRequest(req *base.Request) (*base.Response, error) {
 
 func (sc *ServerConn) handleRequestOuter(req *base.Request) error {
 	if h, ok := sc.s.Handler.(ServerHandlerOnRequest); ok {
-		h.OnRequest(req)
+		h.OnRequest(sc, req)
 	}
 
 	res, err := sc.handleRequest(req)
@@ -494,7 +494,7 @@ func (sc *ServerConn) handleRequestOuter(req *base.Request) error {
 	res.Header["Server"] = base.HeaderValue{"gortsplib"}
 
 	if h, ok := sc.s.Handler.(ServerHandlerOnResponse); ok {
-		h.OnResponse(res)
+		h.OnResponse(sc, res)
 	}
 
 	switch {
diff --git a/serverhandler.go b/serverhandler.go
index 26ef55a4..ff19949c 100644
--- a/serverhandler.go
+++ b/serverhandler.go
@@ -31,12 +31,12 @@ type ServerHandlerOnSessionClose interface {
 
 // ServerHandlerOnRequest can be implemented by a ServerHandler.
 type ServerHandlerOnRequest interface {
-	OnRequest(*base.Request)
+	OnRequest(*ServerConn, *base.Request)
 }
 
 // ServerHandlerOnResponse can be implemented by a ServerHandler.
 type ServerHandlerOnResponse interface {
-	OnResponse(*base.Response)
+	OnResponse(*ServerConn, *base.Response)
 }
 
 // ServerHandlerOnDescribeCtx is the context of a DESCRIBE request.