diff --git a/.changeset/sour-dolls-behave.md b/.changeset/sour-dolls-behave.md
new file mode 100644
index 00000000000..498e55a7c9f
--- /dev/null
+++ b/.changeset/sour-dolls-behave.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix id extraction in Context.Tag.Identifier
diff --git a/packages/effect/src/Context.ts b/packages/effect/src/Context.ts
index 883883e75f1..5a1a453a8fe 100644
--- a/packages/effect/src/Context.ts
+++ b/packages/effect/src/Context.ts
@@ -89,7 +89,7 @@ export declare namespace Tag {
    * @since 2.0.0
    */
   export type Identifier<T extends Tag<any, any> | TagClassShape<any, any>> = T extends Tag<infer A, any> ? A
-    : T extends TagClassShape<infer A, any> ? A
+    : T extends TagClassShape<any, any> ? T
     : never
 }