diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
index 6a7cc78cff..76c320895e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
@@ -521,8 +521,6 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
       return;
     }
 
-    reactionsView.setBubbleWidth(bodyBubble.getWidth());
-
     boolean needsMeasure = false;
 
     if (hasQuote(messageRecord)) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionsConversationView.java b/app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionsConversationView.java
index 4c9b974460..1ff0195582 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionsConversationView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionsConversationView.java
@@ -118,6 +118,7 @@ public class ReactionsConversationView extends LinearLayout {
       return false;
     }
 
+    bubbleWidth = -1;
     this.records.clear();
     this.records.addAll(records);