diff --git a/packages/solid-router/src/awaited.tsx b/packages/solid-router/src/awaited.tsx
index 7bb231ebb7..42ef0498b6 100644
--- a/packages/solid-router/src/awaited.tsx
+++ b/packages/solid-router/src/awaited.tsx
@@ -30,20 +30,11 @@ export function Await<T>(
     children: (result: T) => SolidNode
   },
 ) {
-  const inner = <AwaitInner {...props} />
-  if (props.fallback) {
-    return <Solid.Suspense fallback={props.fallback}>{inner}</Solid.Suspense>
-  }
-  return inner
-}
-
-function AwaitInner<T>(
-  props: AwaitOptions<T> & {
-    fallback?: SolidNode
-    children: (result: T) => SolidNode
-  },
-): Solid.JSX.Element {
-  const [data] = useAwaited(props)
+  const [resource] = Solid.createResource(() => props.promise)
 
-  return props.children(data)
+  return (
+    <Solid.Show fallback={props.fallback} when={resource()}>
+      {(data) => props.children(data())}
+    </Solid.Show>
+  )
 }