diff --git a/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.kt
index 3cc2e61d9..c8a6497fd 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.kt
+++ b/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.kt
@@ -176,7 +176,7 @@ object DisplayUtils {
         } else {
             chip.setChipIconResource(R.drawable.ic_circular_group)
         }
-        if(type == "teams"){
+        if(type == "circle"){
             chip.setChipIconResource(R.drawable.icon_team_white)
         }
         chip.setBounds(0, 0, chip.intrinsicWidth, chip.intrinsicHeight)
diff --git a/app/src/main/java/com/nextcloud/talk/utils/message/MessageUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/message/MessageUtils.kt
index 4c6b3c07e..a1c97e54b 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/message/MessageUtils.kt
+++ b/app/src/main/java/com/nextcloud/talk/utils/message/MessageUtils.kt
@@ -107,7 +107,7 @@ class MessageUtils(val context: Context) {
             val individualHashMap = message.messageParameters!![key]
             if (individualHashMap != null) {
                 when (individualHashMap["type"]) {
-                    "user", "guest", "call", "user-group", "email" -> {
+                    "user", "guest", "call", "user-group", "email","circle" -> {
                         val chip = if (individualHashMap["id"] == message.activeUser!!.userId) {
                             R.xml.chip_you
                         } else {