diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
index 09f2a783e..7e1dd3fde 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
@@ -171,9 +171,7 @@ public final class ConversationUpdateItem extends FrameLayout
 
   /** After a short delay, if the main data hasn't shown yet, then a loading message is displayed. */
   private @NonNull LiveData<Spannable> loading(@NonNull LiveData<Spannable> string) {
-    // TODO [greyson] This sometimes isn't working and can instead get stuck on 'loading'.
-    return string;
-//    return LiveDataUtil.until(string, LiveDataUtil.delay(250, new SpannableString(getContext().getString(R.string.ConversationUpdateItem_loading))));
+    return LiveDataUtil.until(string, LiveDataUtil.delay(250, new SpannableString(getContext().getString(R.string.ConversationUpdateItem_loading))));
   }
 
   @Override