diff --git a/src/generators/nodes/RawMustacheTag.ts b/src/generators/nodes/RawMustacheTag.ts
index 0b7f136426..e1311e8e58 100644
--- a/src/generators/nodes/RawMustacheTag.ts
+++ b/src/generators/nodes/RawMustacheTag.ts
@@ -7,7 +7,7 @@ export default class RawMustacheTag extends Tag {
 	init(block: Block) {
 		this.cannotUseInnerHTML();
 		this.var = block.getUniqueName('raw');
-		block.addDependencies(this.metadata.dependencies);
+		block.addDependencies(this.expression.dependencies);
 	}
 
 	build(
diff --git a/src/generators/nodes/shared/mapChildren.ts b/src/generators/nodes/shared/mapChildren.ts
index d0df4be94b..41d52ef5c5 100644
--- a/src/generators/nodes/shared/mapChildren.ts
+++ b/src/generators/nodes/shared/mapChildren.ts
@@ -5,6 +5,7 @@ import IfBlock from '../IfBlock';
 import Slot from '../Slot';
 import Text from '../Text';
 import MustacheTag from '../MustacheTag';
+import RawMustacheTag from '../RawMustacheTag';
 import Window from '../Window';
 import Node from './Node';
 
@@ -17,6 +18,7 @@ function getConstructor(type): typeof Node {
 		case 'Slot': return Slot;
 		case 'Text': return Text;
 		case 'MustacheTag': return MustacheTag;
+		case 'RawMustacheTag': return RawMustacheTag;
 		case 'Window': return Window;
 		default: throw new Error(`Not implemented: ${type}`);
 	}
diff --git a/src/generators/server-side-rendering/visitors/RawMustacheTag.ts b/src/generators/server-side-rendering/visitors/RawMustacheTag.ts
index 9bceda902d..5a3facd672 100644
--- a/src/generators/server-side-rendering/visitors/RawMustacheTag.ts
+++ b/src/generators/server-side-rendering/visitors/RawMustacheTag.ts
@@ -7,8 +7,7 @@ export default function visitRawMustacheTag(
 	block: Block,
 	node: Node
 ) {
-	block.contextualise(node.expression);
-	const { snippet } = node.metadata;
+	const { snippet } = node.expression;
 
 	generator.append('${' + snippet + '}');
 }