diff --git a/app/models/concerns/annotation_base.rb b/app/models/concerns/annotation_base.rb
index 07cfaf5be..d339168f8 100644
--- a/app/models/concerns/annotation_base.rb
+++ b/app/models/concerns/annotation_base.rb
@@ -212,7 +212,7 @@ def content
 
   def get_fields
     if self.json_schema.blank?
-      DynamicAnnotation::Field.includes(:field_instance).where(annotation_id: self.id).to_a
+      DynamicAnnotation::Field.includes(:field_instance, :annotation).where(annotation_id: self.id).to_a
     else
       data = self.read_attribute(:data) || {}
       fields = []