diff --git a/Signal/src/Profiles/OWSProfileManager.m b/Signal/src/Profiles/OWSProfileManager.m
index 831543844..009693179 100644
--- a/Signal/src/Profiles/OWSProfileManager.m
+++ b/Signal/src/Profiles/OWSProfileManager.m
@@ -774,8 +774,7 @@ const NSUInteger kOWSProfileManager_MaxAvatarDiameter = 640;
         {
             NSString *groupIdKey = [groupId hexadecimalString];
 
-            // We just consult the lazy cache, not the db.
-            if (self.groupProfileWhitelistCache[groupIdKey]) {
+            if ([self isGroupIdInProfileWhitelist:groupId]) {
                 return;
             }
 
diff --git a/Signal/src/ViewControllers/ConversationView/MessagesViewController.m b/Signal/src/ViewControllers/ConversationView/MessagesViewController.m
index ffe90fd45..de0e3ed89 100644
--- a/Signal/src/ViewControllers/ConversationView/MessagesViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/MessagesViewController.m
@@ -383,6 +383,7 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
         TSGroupThread *groupThread = (TSGroupThread *)self.thread;
         if ([groupThread.groupModel.groupId isEqualToData:groupId]) {
             [self ensureDynamicInteractions];
+            [self ensureBannerState];
         }
     }
 }
@@ -825,6 +826,7 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
                       @"Text for banner in group conversation view that offers to share your profile with this group.")
                         bannerColor:[UIColor ows_reminderDarkYellowColor]
                         tapSelector:@selector(groupProfileWhitelistBannerWasTapped:)];
+        return;
     }
 }