diff --git a/openbis_ng_ui/webpack.config.grid.js b/openbis_ng_ui/webpack.config.grid.js
index c3d2d8a05883ad297d97ac0540e2dc79b0a15a04..08e328edb60028791b60d6336b13f6ca84f0add0 100644
--- a/openbis_ng_ui/webpack.config.grid.js
+++ b/openbis_ng_ui/webpack.config.grid.js
@@ -1,4 +1,5 @@
 /* eslint-disable */
+const Webpack = require('webpack')
 const path = require('path')
 
 module.exports = {
@@ -18,9 +19,7 @@ module.exports = {
       {
         test: /\.(js|jsx)$/,
         exclude: /node_modules/,
-        use: {
-          loader: 'babel-loader'
-        }
+        use: ['babel-loader']
       },
       {
         test: /\.(css)$/,
@@ -41,9 +40,19 @@ module.exports = {
       '@src': path.resolve(__dirname, 'src/'),
       '@srcTest': path.resolve(__dirname, 'srcTest/'),
       '@srcV3': path.resolve(__dirname, 'srcV3/')
+    },
+    fallback: {
+      stream: require.resolve('stream-browserify'),
+      buffer: require.resolve('buffer')
     }
   },
 
+  plugins: [
+    new Webpack.ProvidePlugin({
+      Buffer: ['buffer', 'Buffer']
+    })
+  ],
+
   externals: {
     react: 'React',
     'react-dom': 'ReactDOM'
diff --git a/openbis_ng_ui/webpack.config.js b/openbis_ng_ui/webpack.config.js
index 5706bc5530b455ee7b27c63681cb15581662730b..4cd5ad89e4b3d43b8c8581341196e606d8c649d0 100644
--- a/openbis_ng_ui/webpack.config.js
+++ b/openbis_ng_ui/webpack.config.js
@@ -1,4 +1,5 @@
 /* eslint-disable */
+const Webpack = require('webpack')
 const HtmlWebpackPlugin = require('html-webpack-plugin')
 const path = require('path')
 
@@ -10,15 +11,14 @@ module.exports = {
   },
 
   mode: 'production',
+  devtool: 'source-map',
 
   module: {
     rules: [
       {
         test: /\.(js|jsx)$/,
         exclude: /node_modules/,
-        use: {
-          loader: 'babel-loader'
-        }
+        use: ['babel-loader']
       },
       {
         test: /\.(css)$/,
@@ -39,6 +39,10 @@ module.exports = {
       '@src': path.resolve(__dirname, 'src/'),
       '@srcTest': path.resolve(__dirname, 'srcTest/'),
       '@srcV3': path.resolve(__dirname, 'srcV3/')
+    },
+    fallback: {
+      stream: require.resolve('stream-browserify'),
+      buffer: require.resolve('buffer')
     }
   },
 
@@ -47,6 +51,9 @@ module.exports = {
       inject: 'body',
       filename: './index.html',
       template: './index.html'
+    }),
+    new Webpack.ProvidePlugin({
+      Buffer: ['buffer', 'Buffer']
     })
   ]
 }