diff --git a/packages/effect-fc/src/Component.ts b/packages/effect-fc/src/Component.ts
index 79efb67..85331ac 100644
--- a/packages/effect-fc/src/Component.ts
+++ b/packages/effect-fc/src/Component.ts
@@ -329,12 +329,12 @@ export const withOptions: {
 ))
 
 export const withRuntime: {
-    <E, R, P extends {}>(
+    <T extends Component<any, R, any>, R>(
         context: React.Context<Runtime.Runtime<R>>,
-    ): {
-        (self: Component<E, R, P> & Suspense): React.FC<P & SuspenseProps>
-        (self: Component<E, R, P>): React.FC<P>
-    }
+    ): (self: T) => React.FC<T extends Suspense
+        ? Component.Props<T> & SuspenseProps
+        : Component.Props<T>
+    >
     <E, R, P extends {}>(
         self: Component<E, R, P> & Suspense,
         context: React.Context<Runtime.Runtime<R>>,