diff --git a/src/server/optimizing-compiler/codegen.js b/src/server/optimizing-compiler/codegen.js
index 26097c07b48..9399761383a 100644
--- a/src/server/optimizing-compiler/codegen.js
+++ b/src/server/optimizing-compiler/codegen.js
@@ -225,7 +225,11 @@ function nodesToSegments (
     } else if (c.type === 2) {
       segments.push({ type: INTERPOLATION, value: c.expression })
     } else if (c.type === 3) {
-      segments.push({ type: RAW, value: escape(c.text) })
+      let text = escape(c.text)
+      if (c.isComment) {
+        text = '<!--' + text + '-->'
+      }
+      segments.push({ type: RAW, value: text })
     }
   }
   return segments
diff --git a/test/unit/modules/server-compiler/compiler-options.spec.js b/test/unit/modules/server-compiler/compiler-options.spec.js
new file mode 100644
index 00000000000..aa151a89f59
--- /dev/null
+++ b/test/unit/modules/server-compiler/compiler-options.spec.js
@@ -0,0 +1,13 @@
+import { ssrCompile } from 'web/server/compiler'
+
+describe('ssrCompile options', () => {
+  it('comments', () => {
+    const compiled = ssrCompile(`
+      <div>
+        <!-- test comments -->
+      </div>
+    `, { comments: true })
+
+    expect(compiled.render).toContain('<!-- test comments -->')
+  })
+})