diff --git a/elementary/messages/blocks.py b/elementary/messages/blocks.py
index 2f24b206f..bc2160f2f 100644
--- a/elementary/messages/blocks.py
+++ b/elementary/messages/blocks.py
@@ -113,7 +113,7 @@ class ActionsBlock(BaseBlock):
     "LineBlock",
 ]
 
-LineBlock.model_rebuild()
+LineBlock.update_forward_refs()
 
 
 class HeaderBlock(BaseBlock):
@@ -184,4 +184,4 @@ class ExpandableBlock(BaseBlock):
 ]
 
 # Update forward references for recursive types
-ExpandableBlock.model_rebuild()
+ExpandableBlock.update_forward_refs()
diff --git a/elementary/messages/message_body.py b/elementary/messages/message_body.py
index 0ff8cc572..e9675c868 100644
--- a/elementary/messages/message_body.py
+++ b/elementary/messages/message_body.py
@@ -39,4 +39,4 @@ class MessageBody(BaseModel):
     id: Optional[str] = None
 
 
-MessageBody.model_rebuild()
+MessageBody.update_forward_refs()