diff --git a/app/src/main/java/com/perflyst/twire/adapters/ChatAdapter.java b/app/src/main/java/com/perflyst/twire/adapters/ChatAdapter.java
index 9f642d79..8515e313 100644
--- a/app/src/main/java/com/perflyst/twire/adapters/ChatAdapter.java
+++ b/app/src/main/java/com/perflyst/twire/adapters/ChatAdapter.java
@@ -95,6 +95,8 @@ public void onBindViewHolder(@NonNull final ContactViewHolder holder, int positi
                 if (!message.systemMessage.isEmpty()) builder.append('\n');
 
                 for (Badge badge : message.getBadges()) {
+                    if (badge == null) { continue; }
+
                     final GlideImageSpan badgeSpan = new GlideImageSpan(context, badge.getUrl(2), holder.message, 36, 1, badge.color);
                     appendSpan(builder, "  ", badgeSpan).append(" ");
                 }