diff --git a/src/channel.js b/src/channel.js
index d813e9b74..91e961547 100644
--- a/src/channel.js
+++ b/src/channel.js
@@ -18,9 +18,15 @@ class Channel {
     }
     
     addMessage(data){
+        
+        if(this.messages.length > 1000){
+            this.messages.splice(0,1);
+        }
+        
 		if(!this.getMessage("id", data.id)){
 			this.messages.push(data);
 		}
+        
 		return this.getMessage("id", data.id);
 	}