diff --git a/api/server/collections/chats.ts b/api/server/collections/chats.ts
index e61c71528..329eb50b3 100644
--- a/api/server/collections/chats.ts
+++ b/api/server/collections/chats.ts
@@ -1,4 +1,10 @@
 import { MongoObservable } from 'meteor-rxjs';
 import { Chat } from '../models';
+import { Messages } from './messages';
 
 export const Chats = new MongoObservable.Collection<Chat>('chats');
+
+// Dispose unused messages
+Chats.collection.after.remove(function (userId, doc) {
+  Messages.collection.remove({ chatId: doc._id });
+});