diff --git a/Gruntfile.js b/Gruntfile.js
index 8b8b3d2d..94afa86b 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -47,8 +47,8 @@ module.exports = function(grunt) {
           transform: [
             ["babelify", {
               global: true,
-              // Only babelify web-stream-tools, asmcrypto, address-rfc2822 and seek-bzip in node_modules
-              only: /^(?:.*\/node_modules\/web-stream-tools\/|.*\/node_modules\/asmcrypto\.js\/|.*\/node_modules\/address-rfc2822\/|.*\/node_modules\/seek-bzip\/|(?!.*\/node_modules\/)).*$/,
+              // Only babelify web-streams-polyfill, web-stream-tools, asmcrypto, address-rfc2822 and seek-bzip in node_modules
+              only: /^(?:.*\/node_modules\/@mattiasbuelens\/web-streams-polyfill\/|.*\/node_modules\/web-stream-tools\/|.*\/node_modules\/asmcrypto\.js\/|.*\/node_modules\/address-rfc2822\/|.*\/node_modules\/seek-bzip\/|(?!.*\/node_modules\/)).*$/,
               plugins: compat ? [
                 "transform-async-to-generator",
                 "syntax-async-functions",
diff --git a/src/polyfills.js b/src/polyfills.js
index 49aa9d86..f5f15bec 100644
--- a/src/polyfills.js
+++ b/src/polyfills.js
@@ -52,7 +52,7 @@ if (typeof window !== 'undefined') {
 }
 
 if (typeof TransformStream === 'undefined') {
-  require('@mattiasbuelens/web-streams-polyfill');
+  require('@mattiasbuelens/web-streams-polyfill/es6');
 }
 if (typeof TextEncoder === 'undefined') {
   const nodeUtil = util.nodeRequire('util') || {};