diff --git a/api/src/resources/comment.rs b/api/src/resources/comment.rs
index bff3be87..e1998ca1 100644
--- a/api/src/resources/comment.rs
+++ b/api/src/resources/comment.rs
@@ -873,7 +873,7 @@ pub struct NewEntityWithSpan {
     pub name: EntityName,
     pub formatted_value: String,
     pub span: NewEntitySpan,
-    pub field_id: FieldId,
+    pub field_id: Option<FieldId>,
 }
 
 #[derive(Debug, Clone, PartialEq, Deserialize, Serialize, Eq)]
@@ -883,7 +883,7 @@ pub struct FieldId(pub String);
 pub struct NewEntityWithSpans {
     pub name: EntityName,
     pub formatted_value: String,
-    pub field_id: FieldId,
+    pub field_id: Option<FieldId>,
     pub spans: Vec<NewEntitySpan>,
 }
 
@@ -900,7 +900,7 @@ pub struct Entity {
     pub name: EntityName,
     pub formatted_value: String,
     pub spans: Vec<EntitySpan>,
-    pub field_id: FieldId,
+    pub field_id: Option<FieldId>,
 }
 
 #[derive(Debug, PartialEq, Clone, Deserialize, Serialize, Eq)]