diff --git a/src/skins/vector/views/atoms/RoomAvatar.js b/src/skins/vector/views/atoms/RoomAvatar.js
index 1cad4c214a..f61b6cec12 100644
--- a/src/skins/vector/views/atoms/RoomAvatar.js
+++ b/src/skins/vector/views/atoms/RoomAvatar.js
@@ -52,7 +52,7 @@ module.exports = React.createClass({
             var initial;
             if (this.props.room.name[0])
                 initial = this.props.room.name[0].toUpperCase();
-            if (initial === '@' && this.props.room.name[1])
+            if ((initial === '@' || initial === '#') && this.props.room.name[1])
                 initial = this.props.room.name[1].toUpperCase();
          
             return (