diff --git a/http3/server.go b/http3/server.go
index 5c39ec04..3dd3d96b 100644
--- a/http3/server.go
+++ b/http3/server.go
@@ -573,8 +573,7 @@ func (s *Server) handleRequest(conn quic.Connection, str quic.Stream, decoder *q
 	}
 	req, err := requestFromHeaders(hfs)
 	if err != nil {
-		// TODO: use the right error code
-		return newStreamError(ErrCodeGeneralProtocolError, err)
+		return newStreamError(ErrCodeMessageError, err)
 	}
 
 	connState := conn.ConnectionState().TLS