diff --git a/.changeset/tidy-starfishes-joke.md b/.changeset/tidy-starfishes-joke.md
new file mode 100644
index 000000000..a26b05703
--- /dev/null
+++ b/.changeset/tidy-starfishes-joke.md
@@ -0,0 +1,5 @@
+---
+'preact-cli': patch
+---
+
+Do not produce preRenderData when --no-prerender option is specified.
diff --git a/packages/cli/lib/resources/body-end.ejs b/packages/cli/lib/resources/body-end.ejs
index be0467270..7e588109a 100644
--- a/packages/cli/lib/resources/body-end.ejs
+++ b/packages/cli/lib/resources/body-end.ejs
@@ -1,7 +1,9 @@
 <%= htmlWebpackPlugin.options.ssr() %>
-<script type="__PREACT_CLI_DATA__">
-	<%= encodeURI(JSON.stringify(htmlWebpackPlugin.options.CLI_DATA)) %>
-</script>
+<% if (htmlWebpackPlugin.options.config.prerender === true) { %>
+	<script type="__PREACT_CLI_DATA__">
+		<%= encodeURI(JSON.stringify(htmlWebpackPlugin.options.CLI_DATA)) %>
+	</script>
+<% } %>
 <% if (webpack.assets.filter(entry => entry.name.match(/bundle(\.\w{5})?.esm.js$/)).length > 0) { %>
 	<% /* Fix for safari < 11 nomodule bug. TODO: Do the following only for safari. */ %>
 	<script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()},!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>