diff --git a/src/server-side-rendering/compile.js b/src/server-side-rendering/compile.js
index e34156745a..6bfcfd58e7 100644
--- a/src/server-side-rendering/compile.js
+++ b/src/server-side-rendering/compile.js
@@ -198,8 +198,6 @@ export default function compile ( parsed, source, { filename }) {
 
 			if ( voidElementNames.test( node.name ) ) {
 				element += '>';
-			} else if ( node.children.length === 0 ) {
-				element += '/>';
 			} else {
 				elementDepth += 1;
 				element += '>' + node.children.map( stringify ).join( '' ) + `</${node.name}>`;
diff --git a/test/server-side-rendering/attribute-boolean/_actual.html b/test/server-side-rendering/attribute-boolean/_actual.html
index c45ee39b0f..1536f3e1e8 100644
--- a/test/server-side-rendering/attribute-boolean/_actual.html
+++ b/test/server-side-rendering/attribute-boolean/_actual.html
@@ -1 +1 @@
-<textarea readonly/>
\ No newline at end of file
+<textarea readonly></textarea>
\ No newline at end of file
diff --git a/test/server-side-rendering/attribute-static/_actual.html b/test/server-side-rendering/attribute-static/_actual.html
index f82d79e45a..99ed594ea6 100644
--- a/test/server-side-rendering/attribute-static/_actual.html
+++ b/test/server-side-rendering/attribute-static/_actual.html
@@ -1 +1 @@
-<div class="foo"/>
\ No newline at end of file
+<div class="foo"></div>
\ No newline at end of file
diff --git a/test/server-side-rendering/empty-elements-closed/_actual.html b/test/server-side-rendering/empty-elements-closed/_actual.html
new file mode 100644
index 0000000000..76a9da4e6e
--- /dev/null
+++ b/test/server-side-rendering/empty-elements-closed/_actual.html
@@ -0,0 +1,2 @@
+<a></a>
+	 <p></p>
\ No newline at end of file
diff --git a/test/server-side-rendering/empty-elements-closed/_expected.html b/test/server-side-rendering/empty-elements-closed/_expected.html
new file mode 100644
index 0000000000..a6725f5e12
--- /dev/null
+++ b/test/server-side-rendering/empty-elements-closed/_expected.html
@@ -0,0 +1,2 @@
+<a></a>
+<p></p>
diff --git a/test/server-side-rendering/empty-elements-closed/main.html b/test/server-side-rendering/empty-elements-closed/main.html
new file mode 100644
index 0000000000..a6725f5e12
--- /dev/null
+++ b/test/server-side-rendering/empty-elements-closed/main.html
@@ -0,0 +1,2 @@
+<a></a>
+<p></p>
diff --git a/test/server-side-rendering/static-div/_actual.html b/test/server-side-rendering/static-div/_actual.html
index 78e7012b82..281c6866c3 100644
--- a/test/server-side-rendering/static-div/_actual.html
+++ b/test/server-side-rendering/static-div/_actual.html
@@ -1 +1 @@
-<div/>
\ No newline at end of file
+<div></div>
\ No newline at end of file