diff --git a/Signal/src/ViewControllers/ConversationView/MessagesViewController.m b/Signal/src/ViewControllers/ConversationView/MessagesViewController.m
index a1b81eb9ea..8bb29abc05 100644
--- a/Signal/src/ViewControllers/ConversationView/MessagesViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/MessagesViewController.m
@@ -649,6 +649,8 @@ typedef enum : NSUInteger {
     } else {
         [self scrollToBottomAnimated:NO];
     }
+
+    [self ensureScrollDownButton];
 }
 
 - (void)scrollToUnreadIndicatorAnimated
@@ -670,6 +672,8 @@ typedef enum : NSUInteger {
                                                 animated:YES];
         }
     }
+    
+    [self ensureScrollDownButton];
 }
 
 - (void)resetContentAndLayout