diff --git a/src/main/java/seedu/edulink/model/tag/Tag.java b/src/main/java/seedu/edulink/model/tag/Tag.java
index b815effdd05..013cc4c07e6 100644
--- a/src/main/java/seedu/edulink/model/tag/Tag.java
+++ b/src/main/java/seedu/edulink/model/tag/Tag.java
@@ -9,7 +9,8 @@
  */
 public class Tag {
 
-    public static final String MESSAGE_CONSTRAINTS = "Tags names should be alphanumeric";
+    public static final String MESSAGE_CONSTRAINTS = "Tags names should be alphanumeric"
+        + " and not more than 15 characters";
     public static final String VALIDATION_REGEX = "\\p{Alnum}+";
 
     public final String tagName;
@@ -29,7 +30,7 @@ public Tag(String tagName) {
      * Returns true if a given string is a valid tag name.
      */
     public static boolean isValidTagName(String test) {
-        return test.matches(VALIDATION_REGEX);
+        return test.matches(VALIDATION_REGEX) && test.length() <= 15;
     }
 
     @Override