diff --git a/src/components/micro-frame/__tests__/__snapshots__/ssr-then-csr-with-flush/renders.expected/loading.0.html b/src/components/micro-frame/__tests__/__snapshots__/ssr-then-csr-with-flush/renders.expected/loading.0.html
new file mode 100644
index 0000000..19635f9
--- /dev/null
+++ b/src/components/micro-frame/__tests__/__snapshots__/ssr-then-csr-with-flush/renders.expected/loading.0.html
@@ -0,0 +1,10 @@
+<div>
+  Host app
+</div>
+<div>
+  mounted: false
+</div>
+<div
+  data-src="embed"
+  id="GENERATED-0"
+/>
\ No newline at end of file
diff --git a/src/components/micro-frame/__tests__/__snapshots__/ssr-then-csr-with-flush/renders.expected/loading.1.html b/src/components/micro-frame/__tests__/__snapshots__/ssr-then-csr-with-flush/renders.expected/loading.1.html
new file mode 100644
index 0000000..18cfb74
--- /dev/null
+++ b/src/components/micro-frame/__tests__/__snapshots__/ssr-then-csr-with-flush/renders.expected/loading.1.html
@@ -0,0 +1,12 @@
+<div>
+  Host app
+</div>
+<div>
+  mounted: false
+</div>
+<div
+  data-src="embed"
+  id="GENERATED-0"
+>
+  <div />
+</div>
\ No newline at end of file
diff --git a/src/components/micro-frame/__tests__/__snapshots__/ssr-then-csr-with-flush/renders.expected/loading.2.html b/src/components/micro-frame/__tests__/__snapshots__/ssr-then-csr-with-flush/renders.expected/loading.2.html
new file mode 100644
index 0000000..ac3ffae
--- /dev/null
+++ b/src/components/micro-frame/__tests__/__snapshots__/ssr-then-csr-with-flush/renders.expected/loading.2.html
@@ -0,0 +1,16 @@
+<div>
+  Host app
+</div>
+<div>
+  mounted: false
+</div>
+<div
+  data-src="embed"
+  id="GENERATED-0"
+>
+  <div>
+    <div
+      hacks=""
+    />
+  </div>
+</div>
\ No newline at end of file
diff --git a/src/components/micro-frame/__tests__/__snapshots__/ssr-then-csr-with-flush/renders.expected/loading.3.html b/src/components/micro-frame/__tests__/__snapshots__/ssr-then-csr-with-flush/renders.expected/loading.3.html
new file mode 100644
index 0000000..5aebcec
--- /dev/null
+++ b/src/components/micro-frame/__tests__/__snapshots__/ssr-then-csr-with-flush/renders.expected/loading.3.html
@@ -0,0 +1,19 @@
+<div>
+  Host app
+</div>
+<div>
+  mounted: false
+</div>
+<div
+  data-src="embed"
+  id="GENERATED-0"
+>
+  <div>
+    <div
+      hacks=""
+    />
+  </div>
+</div>
+<script>
+  $ssr_then_csr_with_flush_index_C=(window.$ssr_then_csr_with_flush_index_C||[]).concat({"l":1,"w":[["s0-8",0,{},{"f":1}]],"t":["o4cI23nl"]})
+</script>
\ No newline at end of file
diff --git a/src/components/micro-frame/__tests__/__snapshots__/ssr-then-csr-with-flush/renders.expected/loading.4.html b/src/components/micro-frame/__tests__/__snapshots__/ssr-then-csr-with-flush/renders.expected/loading.4.html
new file mode 100644
index 0000000..d704942
--- /dev/null
+++ b/src/components/micro-frame/__tests__/__snapshots__/ssr-then-csr-with-flush/renders.expected/loading.4.html
@@ -0,0 +1,16 @@
+<div>
+  Host app
+</div>
+<div>
+  mounted: false
+</div>
+<div>
+  <div>
+    <div
+      hacks=""
+    />
+  </div>
+</div>
+<script>
+  $ssr_then_csr_with_flush_index_C=(window.$ssr_then_csr_with_flush_index_C||[]).concat({"l":1,"w":[["s0-8",0,{},{"f":1}]],"t":["o4cI23nl"]})
+</script>
\ No newline at end of file
diff --git a/src/components/micro-frame/__tests__/__snapshots__/ssr-then-csr-with-flush/renders.expected/loading.5.html b/src/components/micro-frame/__tests__/__snapshots__/ssr-then-csr-with-flush/renders.expected/loading.5.html
new file mode 100644
index 0000000..865d2e0
--- /dev/null
+++ b/src/components/micro-frame/__tests__/__snapshots__/ssr-then-csr-with-flush/renders.expected/loading.5.html
@@ -0,0 +1,16 @@
+<div>
+  Host app
+</div>
+<div>
+  mounted: true
+</div>
+<div>
+  <div>
+    <div
+      hacks=""
+    />
+  </div>
+</div>
+<script>
+  $ssr_then_csr_with_flush_index_C=(window.$ssr_then_csr_with_flush_index_C||[]).concat({"l":1,"w":[["s0-8",0,{},{"f":1}]],"t":["o4cI23nl"]})
+</script>
\ No newline at end of file
diff --git a/src/components/micro-frame/__tests__/fixtures/ssr-then-csr-with-flush/components/app.marko b/src/components/micro-frame/__tests__/fixtures/ssr-then-csr-with-flush/components/app.marko
new file mode 100644
index 0000000..717fe8b
--- /dev/null
+++ b/src/components/micro-frame/__tests__/fixtures/ssr-then-csr-with-flush/components/app.marko
@@ -0,0 +1,11 @@
+class {
+  onCreate() {
+    this.state = { mounted: false };
+  }
+  onMount() {
+    this.state.mounted = true;
+  }
+}
+
+<div>mounted: ${state.mounted}</div>
+<micro-frame src="embed"/>
diff --git a/src/components/micro-frame/__tests__/fixtures/ssr-then-csr-with-flush/embed.marko b/src/components/micro-frame/__tests__/fixtures/ssr-then-csr-with-flush/embed.marko
new file mode 100644
index 0000000..6e75561
--- /dev/null
+++ b/src/components/micro-frame/__tests__/fixtures/ssr-then-csr-with-flush/embed.marko
@@ -0,0 +1,9 @@
+<esbuild-assets/>
+<div>
+  $ out.write("<div ");
+  <await(new Promise((res) => setTimeout(res)))>
+    <@then>hacks</@then>
+  </>
+
+  $ out.write("></div>");
+</div>
diff --git a/src/components/micro-frame/__tests__/fixtures/ssr-then-csr-with-flush/index.marko b/src/components/micro-frame/__tests__/fixtures/ssr-then-csr-with-flush/index.marko
new file mode 100644
index 0000000..267d8b1
--- /dev/null
+++ b/src/components/micro-frame/__tests__/fixtures/ssr-then-csr-with-flush/index.marko
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>Simple Example</title>
+  <esbuild-assets/>
+</head>
+<body>
+  <div>Host app</div>
+  <app/>
+</body>
+</html>
diff --git a/src/components/micro-frame/__tests__/server.test.ts b/src/components/micro-frame/__tests__/server.test.ts
index e2c9f9b..cc70faf 100644
--- a/src/components/micro-frame/__tests__/server.test.ts
+++ b/src/components/micro-frame/__tests__/server.test.ts
@@ -12,6 +12,11 @@ describe(
   fixture(path.join(__dirname, "fixtures/ssr-then-csr"))
 );
 
+describe(
+  "ssr then csr with flush",
+  fixture(path.join(__dirname, "fixtures/ssr-then-csr-with-flush"))
+);
+
 describe(
   "csr stream text",
   fixture(path.join(__dirname, "fixtures/csr-stream-text"))