diff --git a/app/lib/methods/updateMessages.ts b/app/lib/methods/updateMessages.ts
index 6acbdce14..c8f9dc2b0 100644
--- a/app/lib/methods/updateMessages.ts
+++ b/app/lib/methods/updateMessages.ts
@@ -136,6 +136,9 @@ export default async function updateMessages({
 			try {
 				return message.prepareUpdate(
 					protectedFunction((m: TMessageModel) => {
+						if (newMessage && !newMessage?.blocks) {
+							newMessage.blocks = null;
+						}
 						Object.assign(m, newMessage);
 					})
 				);
@@ -160,6 +163,9 @@ export default async function updateMessages({
 			try {
 				return threadMessage.prepareUpdate(
 					protectedFunction((tm: TThreadMessageModel) => {
+						if (newThreadMessage && !newThreadMessage?.blocks) {
+							newThreadMessage.blocks = null;
+						}
 						Object.assign(tm, newThreadMessage);
 						if (threadMessage.tmid) {
 							tm.rid = threadMessage.tmid;