diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index 78e5c0e057dd1cc71fcedb7c7544182518f0fc51..05f6d56262991ceab1be6345e4640a4bb98ead8b 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -59,6 +59,7 @@ import androidx.viewpager.widget.ViewPager;
 import com.caverock.androidsvg.SVG;
 
 import com.cheogram.android.ConversationPage;
+import com.cheogram.android.Util;
 import com.cheogram.android.WebxdcPage;
 
 import com.google.android.material.tabs.TabLayout;
@@ -1751,6 +1752,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
                         }
                     }
                     binding.values.setAdapter(values);
+                    Util.justifyListViewHeightBasedOnChildren(binding.values);
 
                     if (field.getType().equals(Optional.of("jid-single")) || field.getType().equals(Optional.of("jid-multi"))) {
                         binding.values.setOnItemClickListener((arg0, arg1, pos, id) -> {