diff --git a/client/components/ChatInput.vue b/client/components/ChatInput.vue
index e079a70a..6c3af610 100644
--- a/client/components/ChatInput.vue
+++ b/client/components/ChatInput.vue
@@ -202,6 +202,11 @@ export default {
 				this.channel.inputHistory.splice(1, 0, text);
 			}
 
+			// Limit input history to a 100 entries
+			if (this.channel.inputHistory.length > 100) {
+				this.channel.inputHistory.pop();
+			}
+
 			if (text[0] === "/") {
 				const args = text.substr(1).split(" ");
 				const cmd = args.shift().toLowerCase();