diff --git a/src/backend/base/langflow/memory.py b/src/backend/base/langflow/memory.py
index 3efdc59c4..ebf8fac3d 100644
--- a/src/backend/base/langflow/memory.py
+++ b/src/backend/base/langflow/memory.py
@@ -135,10 +135,10 @@ async def aupdate_messages(messages: Message | list[Message]) -> list[Message]:
         for message in messages:
             msg = await session.get(MessageTable, message.id)
             if msg:
-                if hasattr(message, "data"):
-                    msg = msg.sqlmodel_update(message.data)
-                else:
-                    msg = msg.sqlmodel_update(message.model_dump(exclude_unset=True, exclude_none=True))
+                msg = msg.sqlmodel_update(message.model_dump(exclude_unset=True, exclude_none=True))
+                # Convert flow_id to UUID if it's a string preventing error when saving to database
+                if msg.flow_id and isinstance(msg.flow_id, str):
+                    msg.flow_id = UUID(msg.flow_id)
                 session.add(msg)
                 await session.commit()
                 await session.refresh(msg)