diff --git a/src/analysis/env_builder/__tests__/name_def_test.ml b/src/analysis/env_builder/__tests__/name_def_test.ml
index e676930a4f5..5d87c51a609 100644
--- a/src/analysis/env_builder/__tests__/name_def_test.ml
+++ b/src/analysis/env_builder/__tests__/name_def_test.ml
@@ -570,6 +570,23 @@ class D extends C {
   [%expect {|
     legal scc: (((2, 6) to (2, 7)); ((5, 6) to (5, 7))) |}]
 
+let%expect_test "class_extends_cast" =
+  print_order_test {|
+type Ref = { children: Array<Node> };
+
+declare const referencedInClassExtends: Ref;
+
+declare function f(v: mixed): mixed;
+
+class Node extends (f(referencedInClassExtends) as any) {}
+  |};
+  [%expect {|
+    (8, 6) to (8, 10) =>
+    (2, 5) to (2, 8) =>
+    (4, 14) to (4, 38) =>
+    (6, 17) to (6, 18) =>
+    (8, 22) to (8, 46) (Env_api.Make.ExpressionLoc) |}]
+
 let%expect_test "enum" =
   print_order_test {|
 function havoced() {
diff --git a/src/analysis/env_builder/name_def_ordering.ml b/src/analysis/env_builder/name_def_ordering.ml
index db447a12ae4..0562e4820a7 100644
--- a/src/analysis/env_builder/name_def_ordering.ml
+++ b/src/analysis/env_builder/name_def_ordering.ml
@@ -605,6 +605,24 @@ struct
             expr
           )
 
+        method class_extends_sig
+            ((_, { Ast.Class.Extends.expr; targs; comments = _ }) : ('loc, 'loc) Ast.Class.Extends.t)
+            : unit =
+          Base.Option.iter targs ~f:(fun targs -> ignore @@ this#type_args targs);
+          (* We only visit expressions that is used to generate the class signature. *)
+          let rec visit_expr_for_sig ((_, expr') as expr) =
+            let open Ast.Expression in
+            match expr' with
+            | Identifier _ -> ignore @@ this#expression expr
+            | Member { Member._object; property = Member.PropertyIdentifier _; comments = _ } ->
+              visit_expr_for_sig _object
+            | AsExpression { AsExpression.expression = _; annot; comments = _ }
+            | TypeCast { TypeCast.expression = _; annot; comments = _ } ->
+              ignore @@ this#type_annotation annot
+            | _ -> ()
+          in
+          visit_expr_for_sig expr
+
         method class_body_annotated (cls_body : ('loc, 'loc) Ast.Class.Body.t) =
           let open Ast.Class.Body in
           let (_, { body; comments = _ }) = cls_body in
@@ -878,7 +896,7 @@ struct
           (fun visitor ->
             let open Flow_ast_mapper in
             let _ = visitor#class_body_annotated body in
-            let _ = map_opt (map_loc visitor#class_extends) extends in
+            Base.Option.iter ~f:visitor#class_extends_sig extends;
             let _ = map_opt visitor#class_implements implements in
             let _ = map_list visitor#class_decorator class_decorators in
             let _ = map_opt visitor#type_params tparams in
diff --git a/tests/sealed_tvars/class_ext.js b/tests/sealed_tvars/class_ext.js
index 7111991782c..c6b0d0368c4 100644
--- a/tests/sealed_tvars/class_ext.js
+++ b/tests/sealed_tvars/class_ext.js
@@ -1,9 +1,19 @@
 //@flow
 
-class C extends (42 as any as D).f(x => 42) {}
+{
+  class C extends (42 as any as D).f(x => 42) {}
 
-class D {
-  f(x: mixed): any {
-    return C;
+  class D {
+    f(x: mixed): any {
+      return C;
+    }
   }
 }
+
+{
+  type Ref = { children: Array<Node> };
+  declare const referencedInClassExtends: Ref;
+  declare function f(v: mixed): mixed;
+  // Node does not depend on f and referencedInClassExtends
+  class Node extends (f(referencedInClassExtends) as any) {}
+}
diff --git a/tests/sealed_tvars/sealed_tvars.exp b/tests/sealed_tvars/sealed_tvars.exp
index c2eba57253e..4f122a4c279 100644
--- a/tests/sealed_tvars/sealed_tvars.exp
+++ b/tests/sealed_tvars/sealed_tvars.exp
@@ -14,20 +14,20 @@ Unreachable code. [unreachable-code]
                                        ^^^^^^^^^^^^^^
 
 
-Error ------------------------------------------------------------------------------------------------ class_ext.js:3:17
+Error ------------------------------------------------------------------------------------------------ class_ext.js:4:19
 
 Cannot use `42.f(...)` [1] as a superclass. Only variables and member expressions may be extended [invalid-extends]
 
-   3| class C extends (42 as any as D).f(x => 42) {}
-                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^ [1]
+   4|   class C extends (42 as any as D).f(x => 42) {}
+                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^ [1]
 
 
-Error ------------------------------------------------------------------------------------------------ class_ext.js:3:36
+Error ------------------------------------------------------------------------------------------------ class_ext.js:4:38
 
 An annotation on `x` is required because Flow cannot infer its type from local context. [missing-local-annot]
 
-   3| class C extends (42 as any as D).f(x => 42) {}
-                                         ^
+   4|   class C extends (42 as any as D).f(x => 42) {}
+                                           ^
 
 
 Error ---------------------------------------------------------------------------------------------------- enums.js:2:17