diff --git a/src/node_modules/@internal/micro-frame-component/components/ssr-wait.marko b/src/node_modules/@internal/micro-frame-component/components/ssr-wait.marko
new file mode 100644
index 0000000..73968c0
--- /dev/null
+++ b/src/node_modules/@internal/micro-frame-component/components/ssr-wait.marko
@@ -0,0 +1,26 @@
+<await(input.iter.next()) timeout=input.timeout>
+  <@then|{ value, done }|>
+    <if(done)>
+      <if(input.loading)>
+        <!-- Remove all of the <@loading> content after we've received all the data -->
+        $ out.script(
+          `((e,t,d)=>{t=document.getElementById(e);do{t.removeChild(d=t.firstChild)}while(d.data!==e)})(${JSON.stringify(input.id)});`,
+        );
+      </if>
+    </if>
+    <else>
+      $!{value}
+      <ssr-wait ...input/>
+    </else>
+  </@then>
+  <@catch|err|>
+    <if(input.catch)>
+      <!-- Remove everything in the container and render our catch handler -->
+      $ out.write(`<script>(function(e){if(e)e.textContent=""})(document.getElementById(${JSON.stringify(input.id)}))</script>`);
+      <${input.catch}(err)/>
+    </if>
+    <else>
+      $ throw err;
+    </else>
+  </@catch>
+</await>
diff --git a/src/node_modules/@internal/micro-frame-component/node.marko b/src/node_modules/@internal/micro-frame-component/node.marko
index 280f2c8..3b3b2b4 100644
--- a/src/node_modules/@internal/micro-frame-component/node.marko
+++ b/src/node_modules/@internal/micro-frame-component/node.marko
@@ -98,36 +98,13 @@ static async function fetchStream(input, out) {
   $ out.bf("@_", component, true);
   <await(fetchStream(input, out)) timeout=input.timeout catch=input.catch>
     <@then|iter|>
-      <macro name="wait">
-        <await(iter.next()) timeout=input.timeout>
-          <@then|{ value, done }|>
-            <if(done)>
-              <if(input.loading)>
-                <!-- Remove all of the <@loading> content after we've received all the data -->
-                $ out.script(
-                  `((e,t,d)=>{t=document.getElementById(e);do{t.removeChild(d=t.firstChild)}while(d.data!==e)})(${JSON.stringify(component.id)});`,
-                );
-              </if>
-            </if>
-            <else>
-              $!{value}
-              <wait/>
-            </else>
-          </@then>
-          <@catch|err|>
-            <if(input.catch)>
-              <!-- Remove everything in the container and render our catch handler -->
-              <script>(function(e){if(e)e.textContent=""})(document.getElementById(${JSON.stringify(component.id)}))</script>
-              <${input.catch}(err)/>
-            </if>
-            <else>
-              $ throw err;
-            </else>
-          </@catch>
-        </await>
-      </macro>
-
-      <wait/>
+      <ssr-wait
+        id=component.id
+        iter=iter
+        timeout=input.timeout
+        loading=input.loading
+        catch=input.catch
+      />
     </@then>
   </await>
   $ out.ef();
diff --git a/src/node_modules/@internal/micro-frame-slot-component/components/ssr-wait.marko b/src/node_modules/@internal/micro-frame-slot-component/components/ssr-wait.marko
new file mode 100644
index 0000000..9e2f93c
--- /dev/null
+++ b/src/node_modules/@internal/micro-frame-slot-component/components/ssr-wait.marko
@@ -0,0 +1,23 @@
+<await(input.iter.next())
+  client-reorder=(
+    input.clientReorder === "after-first-chunk"
+      ? !!input.loaded
+      : !!input.clientReorder
+  )
+  timeout=input.timeout
+>
+  <@then|{ value, done }|>
+    <if(!done)>
+      $!{value}
+      <ssr-wait ...input loaded/>
+    </if>
+    <else>
+      $ input.finishLoading();
+    </else>
+  </@then>
+  <@catch|e|>
+    $ input.finishLoading();
+    $ out.write(`<script>(function(e){if(e)e.textContent=""})(document.getElementById(${JSON.stringify(input.id)}))</script>`);
+    <${input.catch}(e)/>
+  </@catch>
+</await>
diff --git a/src/node_modules/@internal/micro-frame-slot-component/node.marko b/src/node_modules/@internal/micro-frame-slot-component/node.marko
index ba7d801..7a8e9bc 100644
--- a/src/node_modules/@internal/micro-frame-slot-component/node.marko
+++ b/src/node_modules/@internal/micro-frame-slot-component/node.marko
@@ -1,40 +1,35 @@
 import { getSource } from "../../../util/stream";
-
-$ {
-  const streamSource = getSource(input.from, out);
-  const stream = streamSource.slot(input.slot);
-  let finishLoading;
-  const loadingPromise =
-    input.loading && new Promise((res) => (finishLoading = res));
-}
-<div id=component.id class=input.class style=input.style data-slot=input.slot data-from=input.from>
-  <macro|{ loaded }| name="wait">
-    <await(stream.next())
-      client-reorder=(input.clientReorder === "after-first-chunk" ? !!loaded : !!input.clientReorder)
-      timeout=input.timeout
-    >
-      <@then|{ value, done }|>
-        <if(!done)>
-          $!{value}
-          <wait loaded=true />
-        </if>
-        <else>
-          $ finishLoading && finishLoading();
-        </else>
-      </@then>
-      <@catch|e|>
-        $ finishLoading && finishLoading();
-        <script>(function(e){if(e)e.textContent=""})(document.getElementById(${JSON.stringify(component.id)}))</script>
-        <${input.catch}(e)/>
-      </@catch>
-    </await>
-  </macro>
+$ const streamSource = getSource(input.from, out);
+$ const stream = streamSource.slot(input.slot);
+$ let finishLoading;
+$ const loadingPromise = (
+  input.loading && new Promise((res) => (finishLoading = res))
+);
+<div
+  id=component.id
+  class=input.class
+  style=input.style
+  data-slot=input.slot
+  data-from=input.from
+>
   $ out.bf("@_", component, true);
   <if(stream)>
     <if(input.loading)>
-      <await(loadingPromise) placeholder=input.loading client-reorder/>
+      <await(loadingPromise)
+        timeout=input.timeout
+        placeholder=input.loading
+        client-reorder
+      />
     </if>
-    <wait/>
+    <ssr-wait
+      id=component.id
+      iter=stream
+      timeout=input.timeout
+      clientReorder=input.clientReorder
+      finishLoading=(() => finishLoading && finishLoading())
+      loaded=false
+      catch=input.catch
+    />
   </if>
   $ out.ef();
 </div>