diff --git a/src/ast/nodes/ExportAllDeclaration.ts b/src/ast/nodes/ExportAllDeclaration.ts
index 8a21f27ac8f..b7cb6b7c7b7 100644
--- a/src/ast/nodes/ExportAllDeclaration.ts
+++ b/src/ast/nodes/ExportAllDeclaration.ts
@@ -1,8 +1,11 @@
+import MagicString from 'magic-string';
+import { NodeRenderOptions, RenderOptions } from '../../utils/renderHelpers';
 import Literal from './Literal';
 import * as NodeType from './NodeType';
 import { NodeBase } from './shared/Node';
 
 export default class ExportAllDeclaration extends NodeBase {
+	needsBoundaries!: true;
 	source!: Literal<string>;
 	type!: NodeType.tExportAllDeclaration;
 
@@ -13,4 +16,13 @@ export default class ExportAllDeclaration extends NodeBase {
 	initialise() {
 		this.context.addExport(this);
 	}
+
+	render(code: MagicString, _options: RenderOptions, nodeRenderOptions?: NodeRenderOptions) {
+		code.remove(
+			(nodeRenderOptions as NodeRenderOptions).start as number,
+			(nodeRenderOptions as NodeRenderOptions).end as number
+		);
+	}
 }
+
+ExportAllDeclaration.prototype.needsBoundaries = true;
diff --git a/test/form/samples/no-treeshake/_expected/amd.js b/test/form/samples/no-treeshake/_expected/amd.js
index 895b9292d6f..4148d7a90bd 100644
--- a/test/form/samples/no-treeshake/_expected/amd.js
+++ b/test/form/samples/no-treeshake/_expected/amd.js
@@ -47,6 +47,7 @@ define(['exports', 'external'], function (exports, external) { 'use strict';
 
 	exports.create = create;
 	exports.getPrototypeOf = getPrototypeOf;
+	exports.quux = quux;
 	exports.strange = quux;
 
 	Object.defineProperty(exports, '__esModule', { value: true });
diff --git a/test/form/samples/no-treeshake/_expected/cjs.js b/test/form/samples/no-treeshake/_expected/cjs.js
index b7ee6f6291a..27872bf8fba 100644
--- a/test/form/samples/no-treeshake/_expected/cjs.js
+++ b/test/form/samples/no-treeshake/_expected/cjs.js
@@ -51,4 +51,5 @@ test({
 
 exports.create = create;
 exports.getPrototypeOf = getPrototypeOf;
+exports.quux = quux;
 exports.strange = quux;
diff --git a/test/form/samples/no-treeshake/_expected/es.js b/test/form/samples/no-treeshake/_expected/es.js
index 9303e39feb6..b147a6d2916 100644
--- a/test/form/samples/no-treeshake/_expected/es.js
+++ b/test/form/samples/no-treeshake/_expected/es.js
@@ -45,4 +45,4 @@ test({
 	}
 });
 
-export { create, getPrototypeOf, quux as strange };
+export { create, getPrototypeOf, quux, quux as strange };
diff --git a/test/form/samples/no-treeshake/_expected/iife.js b/test/form/samples/no-treeshake/_expected/iife.js
index 041845fac3a..5a4250d595e 100644
--- a/test/form/samples/no-treeshake/_expected/iife.js
+++ b/test/form/samples/no-treeshake/_expected/iife.js
@@ -48,6 +48,7 @@ var stirred = (function (exports, external) {
 
 	exports.create = create;
 	exports.getPrototypeOf = getPrototypeOf;
+	exports.quux = quux;
 	exports.strange = quux;
 
 	return exports;
diff --git a/test/form/samples/no-treeshake/_expected/umd.js b/test/form/samples/no-treeshake/_expected/umd.js
index 10e311e6eb3..2d469f68437 100644
--- a/test/form/samples/no-treeshake/_expected/umd.js
+++ b/test/form/samples/no-treeshake/_expected/umd.js
@@ -51,6 +51,7 @@
 
 	exports.create = create;
 	exports.getPrototypeOf = getPrototypeOf;
+	exports.quux = quux;
 	exports.strange = quux;
 
 	Object.defineProperty(exports, '__esModule', { value: true });
diff --git a/test/form/samples/no-treeshake/main.js b/test/form/samples/no-treeshake/main.js
index 25adc231533..fbd642ea623 100644
--- a/test/form/samples/no-treeshake/main.js
+++ b/test/form/samples/no-treeshake/main.js
@@ -1,6 +1,8 @@
 import * as external from 'external';
 import foo from './foo.js';
+
 export { quux as strange } from './quux.js';
+export * from './quux.js';
 
 function baz() {
 	return foo + external.value;