diff --git a/api/models/Conversation.js b/api/models/Conversation.js
index c554c9da7..d5a67f0e4 100644
--- a/api/models/Conversation.js
+++ b/api/models/Conversation.js
@@ -27,10 +27,12 @@ module.exports = {
         update.conversationId = newConversationId;
       }
 
-      return await Conversation.findOneAndUpdate({ conversationId: conversationId, user }, update, {
+      const conversation = await Conversation.findOneAndUpdate({ conversationId, user }, update, {
         new: true,
         upsert: true,
-      }).lean();
+      });
+
+      return conversation.toObject();
     } catch (error) {
       logger.error('[saveConvo] Error saving conversation', error);
       return { message: 'Error saving conversation' };
diff --git a/api/models/Message.js b/api/models/Message.js
index c04bb3c7e..b9c82ca36 100644
--- a/api/models/Message.js
+++ b/api/models/Message.js
@@ -58,10 +58,12 @@ module.exports = {
         update.files = files;
       }
 
-      return await Message.findOneAndUpdate({ messageId }, update, {
+      const message = await Message.findOneAndUpdate({ messageId }, update, {
         upsert: true,
         new: true,
-      }).lean();
+      });
+
+      return message.toObject();
     } catch (err) {
       logger.error('Error saving message:', err);
       throw new Error('Failed to save message.');