diff --git a/packages/rollup/rollup.js b/packages/rollup/rollup.js
index e9804ee66..6b7be9a4f 100644
--- a/packages/rollup/rollup.js
+++ b/packages/rollup/rollup.js
@@ -150,12 +150,12 @@ module.exports = (opts) => {
 
             // Really wish rollup would provide this default...
             assetFileNames = outputOptions.assetFileNames || "assets/[name]-[hash][extname]";
-            
+
             const {
                 chunkFileNames = "[name]-[hash].js",
                 entryFileNames = "[name].js",
             } = outputOptions;
-            
+
             // Determine the correct to option for PostCSS by doing a bit of a dance
             let to;
 
@@ -178,6 +178,11 @@ module.exports = (opts) => {
                 usage.addNode(entry, true);
 
                 [ ...imports, ...dynamicImports ].forEach((dep) => {
+                    // Need to filter out invalid deps, see rollup/rollup#2659
+                    if(!dep) {
+                        return;
+                    }
+
                     usage.addNode(dep, true);
                     usage.addDependency(entry, dep);
                 });
@@ -215,7 +220,7 @@ module.exports = (opts) => {
                 // based on the module's template (either entry or chunk)
                 let dest;
                 const template = isEntry ? entryFileNames : chunkFileNames;
-                
+
                 if(template.includes("[hash]")) {
                     const parts = parse(template, fileName);
 
@@ -326,11 +331,11 @@ module.exports = (opts) => {
                     path.dirname(to),
                     path.basename(target)
                 );
-                
+
                 log("map output", target);
 
                 fs.writeFileSync(dest, content.toString(), "utf8");
-                
+
                 if(!assetFileNames.includes("hash")) {
                     return;
                 }
diff --git a/packages/rollup/test/__snapshots__/splitting.test.js.snap b/packages/rollup/test/__snapshots__/splitting.test.js.snap
index ed65e6f3b..c833d3c47 100644
--- a/packages/rollup/test/__snapshots__/splitting.test.js.snap
+++ b/packages/rollup/test/__snapshots__/splitting.test.js.snap
@@ -316,6 +316,8 @@ Array [
 ]
 `;
 
+exports[`/rollup.js code splitting shouldn't break when dynamic imports are tree-shaken away (rollup/rollup#2659) 1`] = `Array []`;
+
 exports[`/rollup.js code splitting shouldn't put bundle-specific CSS in common.css 1`] = `
 Array [
   Object {
diff --git a/packages/rollup/test/specimens/stripped-dynamic-imports/a.js b/packages/rollup/test/specimens/stripped-dynamic-imports/a.js
new file mode 100644
index 000000000..607096cac
--- /dev/null
+++ b/packages/rollup/test/specimens/stripped-dynamic-imports/a.js
@@ -0,0 +1 @@
+export default false ? import('./b.js') : null;
diff --git a/packages/rollup/test/specimens/stripped-dynamic-imports/b.js b/packages/rollup/test/specimens/stripped-dynamic-imports/b.js
new file mode 100644
index 000000000..407090812
--- /dev/null
+++ b/packages/rollup/test/specimens/stripped-dynamic-imports/b.js
@@ -0,0 +1 @@
+export default "hi";
diff --git a/packages/rollup/test/splitting.test.js b/packages/rollup/test/splitting.test.js
index accd602c4..93700c578 100644
--- a/packages/rollup/test/splitting.test.js
+++ b/packages/rollup/test/splitting.test.js
@@ -174,6 +174,33 @@ describe("/rollup.js", () => {
             expect(dir("./dynamic-imports/assets/")).toMatchSnapshot();
         });
 
+        it("shouldn't break when dynamic imports are tree-shaken away (rollup/rollup#2659)", async () => {
+            const bundle = await rollup({
+                input : [
+                    require.resolve("./specimens/stripped-dynamic-imports/a.js"),
+                ],
+
+                plugins : [
+                    plugin({
+                        namer,
+                        map,
+                    }),
+                ],
+            });
+
+            await bundle.write({
+                format,
+                sourcemap,
+
+                assetFileNames,
+                chunkFileNames,
+
+                dir : prefix(`./output/stripped-dynamic-imports`),
+            });
+
+            expect(dir("./stripped-dynamic-imports/assets/")).toMatchSnapshot();
+        });
+
         it("should ouput only 1 JSON file", async () => {
             const bundle = await rollup({
                 input : [
@@ -260,7 +287,7 @@ describe("/rollup.js", () => {
 
             expect(dir("./multiple-chunks/assets")).toMatchSnapshot();
         });
-        
+
         it("should dedupe chunk names using rollup's incrementing counter logic (hashed)", async () => {
             const bundle = await rollup({
                 input : [