diff --git a/config/webpack.common.js b/config/webpack.common.js
index eb20fff2..9afd7dfb 100644
--- a/config/webpack.common.js
+++ b/config/webpack.common.js
@@ -7,6 +7,11 @@ module.exports = {
   resolve: {
     extensions: [".js"]
   },
+  node: {
+    // Consider suggesting jsmediatags use: https://github.com/feross/is-buffer
+    // Cuts 22k
+    Buffer: false
+  },
   module: {
     rules: [
       {
diff --git a/config/webpack.library.js b/config/webpack.library.js
index 262fd7bf..517cabb5 100644
--- a/config/webpack.library.js
+++ b/config/webpack.library.js
@@ -3,6 +3,11 @@ const webpack = require("webpack");
 const UglifyJsPlugin = require("uglifyjs-webpack-plugin");
 
 module.exports = {
+  node: {
+    // Consider suggesting jsmediatags use: https://github.com/feross/is-buffer
+    // Cuts 22k
+    Buffer: false
+  },
   module: {
     rules: [
       {