diff --git a/crates/radicle-types/bindings/cob/thread/Comment.ts b/crates/radicle-types/bindings/cob/thread/Comment.ts
index ed3ff4aa7..e4ea67c98 100644
--- a/crates/radicle-types/bindings/cob/thread/Comment.ts
+++ b/crates/radicle-types/bindings/cob/thread/Comment.ts
@@ -10,8 +10,8 @@ export type Comment<T = Never> = {
   author: Author;
   edits: Array<Edit>;
   reactions: Array<Reaction>;
-  replyTo?: string;
-  location?: T;
+  replyTo: string | null;
+  location: T | null;
   embeds?: Array<Embed>;
   resolved: boolean;
 };
diff --git a/crates/radicle-types/src/cobs/thread.rs b/crates/radicle-types/src/cobs/thread.rs
index 89a1f7eeb..e9020cc15 100644
--- a/crates/radicle-types/src/cobs/thread.rs
+++ b/crates/radicle-types/src/cobs/thread.rs
@@ -42,9 +42,8 @@ pub struct Comment<T = cobs::Never> {
     author: cobs::Author,
     edits: Vec<models::patch::Edit>,
     reactions: Vec<cobs::thread::Reaction>,
-    #[ts(as = "Option<String>", optional)]
+    #[ts(as = "Option<String>")]
     reply_to: Option<cob::thread::CommentId>,
-    #[ts(optional)]
     location: Option<T>,
     #[serde(default, skip_serializing_if = "Vec::is_empty")]
     #[ts(as = "Option<_>", optional)]