diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index 488b54912d..29d4506430 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -414,7 +414,7 @@ var RoomSubList = React.createClass({
 
         var badge;
         if (subListNotifCount > 0) {
-            badge = <div className={badgeClasses}>{subListNotifCount}</div>;
+            badge = <div className={badgeClasses}>{subListNotifCount > 99 ? "99+" : subListNotifCount}</div>;
         }
 
         return (