diff --git a/Vector/Utils/AvatarGenerator.m b/Vector/Utils/AvatarGenerator.m
index b5618be85..0b91f78d7 100644
--- a/Vector/Utils/AvatarGenerator.m
+++ b/Vector/Utils/AvatarGenerator.m
@@ -78,7 +78,7 @@ static UILabel* backgroundLabel = nil;
     
     if (text.length > 0)
     {
-        firstChar = [[text substringToIndex:1] uppercaseString];
+        firstChar = [[text substringToIndex:NSMaxRange([text rangeOfComposedCharacterSequenceAtIndex:0])] uppercaseString];
     }
     
     return firstChar;