diff --git a/public/src/modules/composer/tags.js b/public/src/modules/composer/tags.js
index 1a020b3dde..c9e26c6914 100644
--- a/public/src/modules/composer/tags.js
+++ b/public/src/modules/composer/tags.js
@@ -12,7 +12,9 @@ define(function() {
 			return;
 		}
 
-		tagEl.tagsinput();
+		tagEl.tagsinput({
+			maxTags: 5 // TODO: make configurable
+		});
 		addTags(postData.tags, tagEl);
 
 		var input = postContainer.find('.bootstrap-tagsinput input');