diff --git a/src/compiler/compile/render_dom/wrappers/Element/index.ts b/src/compiler/compile/render_dom/wrappers/Element/index.ts
index ef330224027e..cd46da82d806 100644
--- a/src/compiler/compile/render_dom/wrappers/Element/index.ts
+++ b/src/compiler/compile/render_dom/wrappers/Element/index.ts
@@ -384,7 +384,7 @@ export default class ElementWrapper extends Wrapper {
 		this.add_classes(block);
 		this.add_manual_style_scoping(block);
 
-		if (nodes && this.renderer.options.hydratable && !this.void) {
+		if (nodes && this.renderer.options.hydratable && !this.void && !this.can_use_innerhtml) {
 			block.chunks.claim.push(
 				b`${this.node.children.length > 0 ? nodes : children}.forEach(@detach);`
 			);
diff --git a/src/compiler/compile/render_dom/wrappers/shared/Wrapper.ts b/src/compiler/compile/render_dom/wrappers/shared/Wrapper.ts
index 4bf8c20bd876..96cf65756d8f 100644
--- a/src/compiler/compile/render_dom/wrappers/shared/Wrapper.ts
+++ b/src/compiler/compile/render_dom/wrappers/shared/Wrapper.ts
@@ -35,7 +35,7 @@ export default class Wrapper {
 			}
 		});
 
-		this.can_use_innerhtml = !renderer.options.hydratable;
+		this.can_use_innerhtml = true;
 		this.is_static_content = !renderer.options.hydratable;
 
 		block.wrappers.push(this);
diff --git a/test/hydration/samples/static-content/_after.html b/test/hydration/samples/static-content/_after.html
new file mode 100644
index 000000000000..b422f2de2a55
--- /dev/null
+++ b/test/hydration/samples/static-content/_after.html
@@ -0,0 +1,5 @@
+<div>
+  <p>Hello world</p>
+  <p>Hello world</p>
+  <p>Hello world</p>
+</div>
\ No newline at end of file
diff --git a/test/hydration/samples/static-content/_before.html b/test/hydration/samples/static-content/_before.html
new file mode 100644
index 000000000000..b422f2de2a55
--- /dev/null
+++ b/test/hydration/samples/static-content/_before.html
@@ -0,0 +1,5 @@
+<div>
+  <p>Hello world</p>
+  <p>Hello world</p>
+  <p>Hello world</p>
+</div>
\ No newline at end of file
diff --git a/test/hydration/samples/static-content/main.svelte b/test/hydration/samples/static-content/main.svelte
new file mode 100644
index 000000000000..0429a0a1d2aa
--- /dev/null
+++ b/test/hydration/samples/static-content/main.svelte
@@ -0,0 +1,5 @@
+<div>
+  <p>Hello world</p>
+  <p>Hello world</p>
+  <p>Hello world</p>
+</div>
diff --git a/test/js/samples/hydrating-static-content/_config.js b/test/js/samples/hydrating-static-content/_config.js
new file mode 100644
index 000000000000..758c2f7fdbb3
--- /dev/null
+++ b/test/js/samples/hydrating-static-content/_config.js
@@ -0,0 +1,5 @@
+module.exports = {
+	options: {
+		hydratable: true,
+	},
+};
diff --git a/test/js/samples/hydrating-static-content/expected.js b/test/js/samples/hydrating-static-content/expected.js
new file mode 100644
index 000000000000..34d232121125
--- /dev/null
+++ b/test/js/samples/hydrating-static-content/expected.js
@@ -0,0 +1,48 @@
+/* generated by Svelte vX.Y.Z */
+import {
+	SvelteComponent,
+	children,
+	claim_element,
+	detach,
+	element,
+	init,
+	insert,
+	noop,
+	safe_not_equal
+} from "svelte/internal";
+
+function create_fragment(ctx) {
+	let div;
+
+	return {
+		c() {
+			div = element("div");
+
+			div.innerHTML = `<p>Hello world</p> 
+  <p>Hello world</p> 
+  <p>Hello world</p>`;
+		},
+		l(nodes) {
+			div = claim_element(nodes, "DIV", {});
+			var div_nodes = children(div);
+		},
+		m(target, anchor) {
+			insert(target, div, anchor);
+		},
+		p: noop,
+		i: noop,
+		o: noop,
+		d(detaching) {
+			if (detaching) detach(div);
+		}
+	};
+}
+
+class Component extends SvelteComponent {
+	constructor(options) {
+		super();
+		init(this, options, null, create_fragment, safe_not_equal, {});
+	}
+}
+
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/hydrating-static-content/input.svelte b/test/js/samples/hydrating-static-content/input.svelte
new file mode 100644
index 000000000000..0429a0a1d2aa
--- /dev/null
+++ b/test/js/samples/hydrating-static-content/input.svelte
@@ -0,0 +1,5 @@
+<div>
+  <p>Hello world</p>
+  <p>Hello world</p>
+  <p>Hello world</p>
+</div>