diff --git a/packages/forest_admin_agent/lib/forest_admin_agent/utils/schema/generator_field.rb b/packages/forest_admin_agent/lib/forest_admin_agent/utils/schema/generator_field.rb
index 3f5a10565..0f8940649 100644
--- a/packages/forest_admin_agent/lib/forest_admin_agent/utils/schema/generator_field.rb
+++ b/packages/forest_admin_agent/lib/forest_admin_agent/utils/schema/generator_field.rb
@@ -165,7 +165,8 @@ def build_polymorphic_many_to_one_schema(relation, base_schema)
                 isSortable: false,
                 validations: [],
                 reference: "#{base_schema[:field]}.id",
-                polymorphic_referenced_models: relation.foreign_collections
+                polymorphic_referenced_models: relation.foreign_collections,
+                foreign_key_type_field: relation.foreign_key_type_field
               }
             )
           end
diff --git a/packages/forest_admin_agent/spec/lib/forest_admin_agent/utils/schema/generator_field_polymorphic_spec.rb b/packages/forest_admin_agent/spec/lib/forest_admin_agent/utils/schema/generator_field_polymorphic_spec.rb
index 5501363f6..ec64ce92d 100644
--- a/packages/forest_admin_agent/spec/lib/forest_admin_agent/utils/schema/generator_field_polymorphic_spec.rb
+++ b/packages/forest_admin_agent/spec/lib/forest_admin_agent/utils/schema/generator_field_polymorphic_spec.rb
@@ -86,7 +86,8 @@ module Schema
                   isSortable: false,
                   isVirtual: false,
                   validations: [],
-                  polymorphic_referenced_models: %w[User Order]
+                  polymorphic_referenced_models: %w[User Order],
+                  foreign_key_type_field: 'addressable_type'
                 }
               )
             end