diff --git a/packages/effect-fc/src/Query.ts b/packages/effect-fc/src/Query.ts
index abe6e1c..b2ab6c9 100644
--- a/packages/effect-fc/src/Query.ts
+++ b/packages/effect-fc/src/Query.ts
@@ -33,10 +33,12 @@ extends Pipeable.Class() implements Query<K, A, E, R, P> {
     }
 
     query(key: K) {
-        return this.result.pipe(
+        return this.fiber.pipe(
             Effect.andThen(Option.match({
-
-            }))
+                onSome: Fiber.interrupt,
+                onNone: () => Effect.void,
+            })),
+            Effect.andThen(),
         )
     }
 }