diff --git a/backend/src/plugins/MessageSaver/events/SaveMessagesEvts.ts b/backend/src/plugins/MessageSaver/events/SaveMessagesEvts.ts
index 97f4fe6d..c8464258 100644
--- a/backend/src/plugins/MessageSaver/events/SaveMessagesEvts.ts
+++ b/backend/src/plugins/MessageSaver/events/SaveMessagesEvts.ts
@@ -12,6 +12,11 @@ export const MessageCreateEvt = messageSaverEvt({
       return;
     }
 
+    // Don't save partial messages
+    if (meta.args.message.partial) {
+      return;
+    }
+
     await meta.pluginData.state.savedMessages.createFromMsg(meta.args.message);
   },
 });
@@ -26,6 +31,10 @@ export const MessageUpdateEvt = messageSaverEvt({
       return;
     }
 
+    if (meta.args.oldMessage?.partial) {
+      return;
+    }
+
     await meta.pluginData.state.savedMessages.saveEditFromMsg(meta.args.newMessage as Message);
   },
 });