diff --git a/src/compiler/compile/render_ssr/handlers/DebugTag.ts b/src/compiler/compile/render_ssr/handlers/DebugTag.ts
index 3fd7584d57..7c45d38640 100644
--- a/src/compiler/compile/render_ssr/handlers/DebugTag.ts
+++ b/src/compiler/compile/render_ssr/handlers/DebugTag.ts
@@ -1,19 +1,16 @@
-import { stringify } from '../../utils/stringify';
 import DebugTag from '../../nodes/DebugTag';
 import Renderer, { RenderOptions } from '../Renderer';
+import { x } from 'code-red';
+
 export default function(node: DebugTag, renderer: Renderer, options: RenderOptions) {
 	if (!options.dev) return;
 
 	const filename = options.filename || null;
 	const { line, column } = options.locate(node.start + 1);
 
-	const obj = node.expressions.length === 0
-		? `{}`
-		: `{ ${node.expressions
-			.map(e => e.node.name)
-			.join(', ')} }`;
-
-	const str = '${@debug(' + `${filename && stringify(filename)}, ${line}, ${column}, ${obj})}`;
+	const obj = x`{
+		${node.expressions.map(e => e.node.name)}
+	}`;
 
-	renderer.append(str);
+	renderer.add_expression(x`@debug(${filename ? x`"${filename}"` : x`null`}, ${line}, ${column}, ${obj})`);
 }