diff --git a/src/server/api/endpoints/i/delete-account.ts b/src/server/api/endpoints/i/delete-account.ts
index 217ad0010b..a5e9bfd433 100644
--- a/src/server/api/endpoints/i/delete-account.ts
+++ b/src/server/api/endpoints/i/delete-account.ts
@@ -3,6 +3,7 @@ import * as bcrypt from 'bcryptjs';
 import User from '../../../../models/user';
 import define from '../../define';
 import { createDeleteNotesJob, createDeleteDriveFilesJob } from '../../../../queue';
+import Message from '../../../../models/messaging-message';
 
 export const meta = {
 	requireCredential: true,
@@ -42,6 +43,7 @@ export default define(meta, (ps, user) => new Promise(async (res, rej) => {
 		}
 	});
 
+	Message.remove({ userId: user._id });
 	createDeleteNotesJob(user);
 	createDeleteDriveFilesJob(user);