diff --git a/src/packagers/JSConcatPackager.js b/src/packagers/JSConcatPackager.js
index ef94d057ddf..e0fc1692202 100644
--- a/src/packagers/JSConcatPackager.js
+++ b/src/packagers/JSConcatPackager.js
@@ -19,6 +19,7 @@ const helpers =
 class JSConcatPackager extends Packager {
   async start() {
     this.addedAssets = new Set();
+    this.assets = new Map();
     this.exposedModules = new Set();
     this.externalModules = new Set();
     this.size = 0;
@@ -43,6 +44,8 @@ class JSConcatPackager extends Packager {
         this.needsPrelude = true;
       }
 
+      this.assets.set(asset.id, asset);
+
       for (let mod of asset.depAssets.values()) {
         if (
           !this.bundle.assets.has(mod) &&
@@ -88,19 +91,31 @@ class JSConcatPackager extends Packager {
     for (let identifier in asset.cacheData.imports) {
       let [source, name] = asset.cacheData.imports[identifier];
       let dep = asset.depAssets.get(asset.dependencies.get(source));
+
+      if (name === '*') {
+        this.markUsedExports(dep);
+      }
+
       this.markUsed(dep, name);
     }
   }
 
-  markUsed(mod, id) {
-    let exp = mod.cacheData.exports[id];
+  markUsed(mod, name) {
+    let {id} = this.findExportModule(mod.id, name);
+    mod = this.assets.get(id);
+
+    if (!mod) {
+      return;
+    }
+
+    let exp = mod.cacheData.exports[name];
     if (Array.isArray(exp)) {
       let depMod = mod.depAssets.get(mod.dependencies.get(exp[0]));
       return this.markUsed(depMod, exp[1]);
     }
 
     this.markUsedExports(mod);
-    mod.usedExports.add(id);
+    mod.usedExports.add(name);
   }
 
   getExportIdentifier(asset) {
@@ -521,6 +536,54 @@ class JSConcatPackager extends Packager {
 
     await super.write(output);
   }
+
+  resolveModule(id, name) {
+    let module = this.assets.get(+id);
+    return module.depAssets.get(module.dependencies.get(name));
+  }
+
+  findExportModule(id, name, replacements) {
+    let asset = this.assets.get(+id);
+    let exp =
+      asset &&
+      Object.prototype.hasOwnProperty.call(asset.cacheData.exports, name)
+        ? asset.cacheData.exports[name]
+        : null;
+
+    // If this is a re-export, find the original module.
+    if (Array.isArray(exp)) {
+      let mod = this.resolveModule(id, exp[0]);
+      return this.findExportModule(mod.id, exp[1], replacements);
+    }
+
+    // If this module exports wildcards, resolve the original module.
+    // Default exports are excluded from wildcard exports.
+    let wildcards = asset && asset.cacheData.wildcards;
+    if (wildcards && name !== 'default' && name !== '*') {
+      for (let source of wildcards) {
+        let mod = this.resolveModule(id, source);
+        let m = this.findExportModule(mod.id, name, replacements);
+        if (m.identifier) {
+          return m;
+        }
+      }
+    }
+
+    // If this is a wildcard import, resolve to the exports object.
+    if (asset && name === '*') {
+      exp = `$${id}$exports`;
+    }
+
+    if (replacements && replacements.has(exp)) {
+      exp = replacements.get(exp);
+    }
+
+    return {
+      identifier: exp,
+      name,
+      id
+    };
+  }
 }
 
 module.exports = JSConcatPackager;
diff --git a/src/scope-hoisting/concat.js b/src/scope-hoisting/concat.js
index 673fa3b0991..b7c48087c30 100644
--- a/src/scope-hoisting/concat.js
+++ b/src/scope-hoisting/concat.js
@@ -15,75 +15,26 @@ const THROW_TEMPLATE = template('$parcel$missingModule(MODULE)');
 const REQUIRE_TEMPLATE = template('require(ID)');
 
 module.exports = (packager, ast) => {
-  let {addedAssets} = packager;
+  let {assets} = packager;
   let replacements = new Map();
   let imports = new Map();
   let referenced = new Set();
 
-  let assets = Array.from(addedAssets).reduce((acc, asset) => {
-    acc[asset.id] = asset;
-
-    return acc;
-  }, {});
-
   // Build a mapping of all imported identifiers to replace.
-  for (let asset of addedAssets) {
+  for (let asset of assets.values()) {
     for (let name in asset.cacheData.imports) {
       let imp = asset.cacheData.imports[name];
-      imports.set(name, [resolveModule(asset.id, imp[0]), imp[1]]);
+      imports.set(name, [packager.resolveModule(asset.id, imp[0]), imp[1]]);
     }
   }
 
-  function resolveModule(id, name) {
-    let module = assets[id];
-    return module.depAssets.get(module.dependencies.get(name));
-  }
-
-  function findExportModule(id, name) {
-    let module = assets[id];
-    let exp =
-      module &&
-      Object.prototype.hasOwnProperty.call(module.cacheData.exports, name)
-        ? module.cacheData.exports[name]
-        : null;
-
-    // If this is a re-export, find the original module.
-    if (Array.isArray(exp)) {
-      let mod = resolveModule(id, exp[0]);
-      return findExportModule(mod.id, exp[1]);
-    }
-
-    // If this module exports wildcards, resolve the original module.
-    // Default exports are excluded from wildcard exports.
-    let wildcards = module && module.cacheData.wildcards;
-    if (wildcards && name !== 'default' && name !== '*') {
-      for (let source of wildcards) {
-        let m = findExportModule(resolveModule(id, source).id, name);
-        if (m.identifier) {
-          return m;
-        }
-      }
-    }
-
-    // If this is a wildcard import, resolve to the exports object.
-    if (module && name === '*') {
-      exp = `$${id}$exports`;
-    }
-
-    if (replacements.has(exp)) {
-      exp = replacements.get(exp);
-    }
-
-    return {
-      identifier: exp,
-      name,
-      id
-    };
-  }
-
   function replaceExportNode(module, originalName, path) {
-    let {identifier, name, id} = findExportModule(module.id, originalName);
-    let mod = assets[id];
+    let {identifier, name, id} = packager.findExportModule(
+      module.id,
+      originalName,
+      replacements
+    );
+    let mod = assets.get(id);
     let node;
 
     if (identifier) {
@@ -190,10 +141,10 @@ module.exports = (packager, ast) => {
           );
         }
 
-        let mod = resolveModule(id.value, source.value);
+        let mod = packager.resolveModule(id.value, source.value);
 
         if (!mod) {
-          if (assets[id.value].dependencies.get(source.value).optional) {
+          if (assets.get(id.value).dependencies.get(source.value).optional) {
             path.replaceWith(
               THROW_TEMPLATE({MODULE: t.stringLiteral(source.value)})
             );
@@ -204,7 +155,7 @@ module.exports = (packager, ast) => {
           }
         } else {
           let node;
-          if (assets[mod.id]) {
+          if (assets.get(mod.id)) {
             // Replace with nothing if the require call's result is not used.
             if (!isUnusedValue(path)) {
               let name = `$${mod.id}$exports`;
@@ -241,7 +192,7 @@ module.exports = (packager, ast) => {
           );
         }
 
-        let mapped = assets[id.value];
+        let mapped = assets.get(id.value);
         let dep = mapped.dependencies.get(source.value);
         let mod = mapped.depAssets.get(dep);
         let bundles = mod.id;
@@ -286,7 +237,11 @@ module.exports = (packager, ast) => {
               continue;
             }
 
-            let {identifier} = findExportModule(match[1], key.name, path);
+            let {identifier} = packager.findExportModule(
+              match[1],
+              key.name,
+              replacements
+            );
             if (identifier) {
               replace(value.name, identifier, p);
             }
@@ -336,7 +291,11 @@ module.exports = (packager, ast) => {
         // If it's a $id$exports.name expression.
         if (match) {
           let name = t.isIdentifier(property) ? property.name : property.value;
-          let {identifier} = findExportModule(match[1], name, path);
+          let {identifier} = packager.findExportModule(
+            match[1],
+            name,
+            replacements
+          );
 
           // Check if $id$export$name exists and if so, replace the node by it.
           if (identifier) {
diff --git a/test/integration/scope-hoisting/es6/side-effects-false-wildcards/a.js b/test/integration/scope-hoisting/es6/side-effects-false-wildcards/a.js
new file mode 100644
index 00000000000..82d44ab542e
--- /dev/null
+++ b/test/integration/scope-hoisting/es6/side-effects-false-wildcards/a.js
@@ -0,0 +1,3 @@
+import {foo} from 'bar'
+
+output = foo
diff --git a/test/integration/scope-hoisting/es6/side-effects-false-wildcards/node_modules/bar/a.js b/test/integration/scope-hoisting/es6/side-effects-false-wildcards/node_modules/bar/a.js
new file mode 100644
index 00000000000..21ec276fc7f
--- /dev/null
+++ b/test/integration/scope-hoisting/es6/side-effects-false-wildcards/node_modules/bar/a.js
@@ -0,0 +1 @@
+export const foo = 'bar'
diff --git a/test/integration/scope-hoisting/es6/side-effects-false-wildcards/node_modules/bar/b.js b/test/integration/scope-hoisting/es6/side-effects-false-wildcards/node_modules/bar/b.js
new file mode 100644
index 00000000000..e3862e23973
--- /dev/null
+++ b/test/integration/scope-hoisting/es6/side-effects-false-wildcards/node_modules/bar/b.js
@@ -0,0 +1 @@
+export const bar = 'foo'
diff --git a/test/integration/scope-hoisting/es6/side-effects-false-wildcards/node_modules/bar/index.js b/test/integration/scope-hoisting/es6/side-effects-false-wildcards/node_modules/bar/index.js
new file mode 100644
index 00000000000..630314aa27d
--- /dev/null
+++ b/test/integration/scope-hoisting/es6/side-effects-false-wildcards/node_modules/bar/index.js
@@ -0,0 +1,2 @@
+export * from './a'
+export * from './b'
diff --git a/test/integration/scope-hoisting/es6/side-effects-false-wildcards/node_modules/bar/package.json b/test/integration/scope-hoisting/es6/side-effects-false-wildcards/node_modules/bar/package.json
new file mode 100644
index 00000000000..0960cda8e12
--- /dev/null
+++ b/test/integration/scope-hoisting/es6/side-effects-false-wildcards/node_modules/bar/package.json
@@ -0,0 +1,5 @@
+{
+    "name": "bar",
+    "sideEffects": false
+  }
+  
\ No newline at end of file
diff --git a/test/scope-hoisting.js b/test/scope-hoisting.js
index 7be90a74e64..b2ea1aa7c37 100644
--- a/test/scope-hoisting.js
+++ b/test/scope-hoisting.js
@@ -271,6 +271,16 @@ describe('scope hoisting', function() {
       assert.deepEqual(output, 4);
     });
 
+    it('supports wildcards with sideEffects: false', async function() {
+      let b = await bundle(
+        __dirname +
+          '/integration/scope-hoisting/es6/side-effects-false-wildcards/a.js'
+      );
+      let output = await run(b);
+
+      assert.deepEqual(output, 'bar');
+    });
+
     it('missing exports should be replaced with an empty object', async function() {
       let b = await bundle(
         __dirname + '/integration/scope-hoisting/es6/empty-module/a.js'