diff --git a/pkg/common/mw/rpc.go b/pkg/common/mw/rpc.go
index fb5a2e295..7e5c8e647 100644
--- a/pkg/common/mw/rpc.go
+++ b/pkg/common/mw/rpc.go
@@ -41,6 +41,8 @@ func rpcServerInterceptor(ctx context.Context, req interface{}, info *grpc.Unary
 		opUserID = opts[0]
 	}
 	ctx = tracelog.SetFuncInfos(ctx, funcName, operationID)
+	ctx = context.WithValue(ctx, OperationID, operationID)
+	ctx = context.WithValue(ctx, OpUserID, opUserID)
 	tracelog.SetCtxInfo(ctx, funcName, err, "opUserID", opUserID, "rpcReq", rpcString(req))
 	resp, err = handler(ctx, req)
 	if err != nil {