diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings
index 329ac47e10..4784d36e7f 100644
--- a/Signal/translations/en.lproj/Localizable.strings
+++ b/Signal/translations/en.lproj/Localizable.strings
@@ -3122,7 +3122,7 @@
 "GROUP_LINK_VIEW_TITLE" = "Group Link";
 
 /* Message indicating that the local user was added to the group by another user. Embeds {{remote user name}}. */
-"GROUP_LOCAL_USER_ADDED_TO_GROUP_BY_REMOTE_USER_FORMAT" = "%@ added you.";
+"GROUP_LOCAL_USER_ADDED_TO_GROUP_BY_REMOTE_USER_FORMAT" = "%@ added you to the group.";
 
 /* Message indicating that the local user was granted administrator role. */
 "GROUP_LOCAL_USER_GRANTED_ADMINISTRATOR" = "You are now an admin.";
diff --git a/SignalServiceKit/Messages/Interactions/TSInfoMessage+GroupUpdateItemBuilder.swift b/SignalServiceKit/Messages/Interactions/TSInfoMessage+GroupUpdateItemBuilder.swift
index 96a28c2ee2..17e992f495 100644
--- a/SignalServiceKit/Messages/Interactions/TSInfoMessage+GroupUpdateItemBuilder.swift
+++ b/SignalServiceKit/Messages/Interactions/TSInfoMessage+GroupUpdateItemBuilder.swift
@@ -964,16 +964,18 @@ private struct NewGroupUpdateItemBuilder {
         items.append(contentsOf: groupInsertedUpdateItems)
 
         // Skip update items for things like name, avatar, current members. Do
-        // add update items for the current disappearing messages state. We can
-        // use unknown attribution here – either we created the group (so it was
+        // add update items for the current disappearing messages state if we have one.
+        // We can use unknown attribution here – either we created the group (so it was
         // us who set the time) or someone else did (so we don't know who set
         // the timer), and unknown attribution is always safe.
-        DiffingGroupUpdateItemBuilder.disappearingMessageUpdateItem(
-            groupUpdateSource: groupUpdateSource,
-            oldToken: nil,
-            newToken: newDisappearingMessageToken,
-            forceUnknownAttribution: true
-        ).map { items.append($0) }
+        if newDisappearingMessageToken?.isEnabled == true {
+            DiffingGroupUpdateItemBuilder.disappearingMessageUpdateItem(
+                groupUpdateSource: groupUpdateSource,
+                oldToken: nil,
+                newToken: newDisappearingMessageToken,
+                forceUnknownAttribution: true
+            ).map { items.append($0) }
+        }
 
         if items.contains(where: { if case .createdByLocalUser = $0 { return true } ; return false }) {
             // If we just created the group, add an update item to let users
@@ -1062,10 +1064,10 @@ private struct NewGroupUpdateItemBuilder {
             switch groupUpdateSource {
             case .localUser:
                 return .createdByLocalUser
-            case let .aci(updaterAci):
-                return .createdByOtherUser(updaterAci: updaterAci.codableUuid)
-            case .rejectedInviteToPni, .legacyE164, .unknown:
-                return .createdByUnknownUser
+            case .aci, .rejectedInviteToPni, .legacyE164, .unknown:
+                // Don't show when others created the group,
+                // just when the local user does.
+                return nil
             }
         }
         return nil