diff --git a/core/templates/raw-static-tiddler.tid b/core/templates/raw-static-tiddler.tid
new file mode 100644
index 000000000..0531a391c
--- /dev/null
+++ b/core/templates/raw-static-tiddler.tid
@@ -0,0 +1,7 @@
+title: $:/core/templates/raw-static-tiddler
+
+<!--
+
+This template is used for saving tiddlers as static HTML
+
+--><$view field="text" format="plainwikified" />
\ No newline at end of file
diff --git a/core/templates/static.area.tid b/core/templates/static.area.tid
index a7fbdf7bc..d235ab4ed 100644
--- a/core/templates/static.area.tid
+++ b/core/templates/static.area.tid
@@ -1,6 +1,7 @@
 title: $:/core/templates/static.area
 
 <$reveal type="nomatch" state="$:/isEncrypted" text="yes">
+{{{ [all[shadows+tiddlers]tag[$:/tags/RawStaticContent]!has[draft.of]] ||$:/core/templates/raw-static-tiddler}}}
 {{$:/core/templates/static.content||$:/core/templates/html-tiddler}}
 </$reveal>
 <$reveal type="match" state="$:/isEncrypted" text="yes">