diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/AvatarView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/AvatarView.kt
index 05e37b6ce..b5a06769b 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/widget/AvatarView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/AvatarView.kt
@@ -84,15 +84,15 @@ class AvatarView @JvmOverloads constructor(
         binding.initial.setTextColor(theme.textPrimary)
         binding.icon.setTint(theme.textPrimary)
 
-        if (fullName?.isNotEmpty() == true) {
-            val initials = fullName
-                    ?.substringBefore(',')
-                    ?.split(" ").orEmpty()
-                    .filter { name -> name.isNotEmpty() }
-                    .map { name -> name[0] }
-                    .filter { initial -> initial.isLetterOrDigit() }
-                    .map { initial -> initial.toString() }
+        val initials = fullName
+                ?.substringBefore(',')
+                ?.split(" ").orEmpty()
+                .filter { name -> name.isNotEmpty() }
+                .map { name -> name[0] }
+                .filter { initial -> initial.isLetterOrDigit() }
+                .map { initial -> initial.toString() }
 
+        if (initials.isNotEmpty()) {
             binding.initial.text = if (initials.size > 1) initials.first() + initials.last() else initials.first()
             binding.icon.visibility = GONE
         } else {