diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
index 1b165dba2..2dc4ca706 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
@@ -751,10 +751,13 @@ public class ChatController extends BaseController implements MessagesListAdapte
 
                 } else {
                     boolean foundRealMessage = false;
-                    for (int i = 0; i < chatMessageList.size(); i++) {
-                        if (TextUtils.isEmpty(chatMessageList.get(i).getSystemMessage())) {
-                            foundRealMessage = true;
-                            break;
+
+                    if (conversationUser.hasSpreedCapabilityWithName("system-messages")) {
+                        for (int i = 0; i < chatMessageList.size(); i++) {
+                            if (TextUtils.isEmpty(chatMessageList.get(i).getSystemMessage())) {
+                                foundRealMessage = true;
+                                break;
+                            }
                         }
                     }