diff --git a/src/server-side-rendering/compile.js b/src/server-side-rendering/compile.js
index e2c1432ba0..2bb7b6aa0c 100644
--- a/src/server-side-rendering/compile.js
+++ b/src/server-side-rendering/compile.js
@@ -113,6 +113,10 @@ export default function compile ( parsed, source, { filename }) {
 	let elementDepth = 0;
 
 	const stringifiers = {
+		Comment () {
+			return '';
+		},
+
 		Component ( node ) {
 			const props = node.attributes.map( attribute => {
 				let value;
diff --git a/test/server-side-rendering/comment/_actual.html b/test/server-side-rendering/comment/_actual.html
new file mode 100644
index 0000000000..bc1da94084
--- /dev/null
+++ b/test/server-side-rendering/comment/_actual.html
@@ -0,0 +1,3 @@
+<p>before</p>
+	 
+	 <p>after</p>
\ No newline at end of file
diff --git a/test/server-side-rendering/comment/_expected.html b/test/server-side-rendering/comment/_expected.html
new file mode 100644
index 0000000000..ba0d202ece
--- /dev/null
+++ b/test/server-side-rendering/comment/_expected.html
@@ -0,0 +1,2 @@
+<p>before</p>
+<p>after</p>
diff --git a/test/server-side-rendering/comment/main.html b/test/server-side-rendering/comment/main.html
new file mode 100644
index 0000000000..8ecd344816
--- /dev/null
+++ b/test/server-side-rendering/comment/main.html
@@ -0,0 +1,3 @@
+<p>before</p>
+<!-- a comment -->
+<p>after</p>