diff --git a/webapp/channels/src/components/post_view/combined_system_message/__snapshots__/combined_system_message.test.tsx.snap b/webapp/channels/src/components/post_view/combined_system_message/__snapshots__/combined_system_message.test.tsx.snap
index 0e114bba2e..674299c032 100644
--- a/webapp/channels/src/components/post_view/combined_system_message/__snapshots__/combined_system_message.test.tsx.snap
+++ b/webapp/channels/src/components/post_view/combined_system_message/__snapshots__/combined_system_message.test.tsx.snap
@@ -150,7 +150,7 @@ exports[`components/post_view/CombinedSystemMessage should match snapshot, "remo
 exports[`components/post_view/CombinedSystemMessage should match snapshot, combining users removed from channel by all actors 1`] = `
 <Fragment>
   <Connect(Markdown)
-    message="@removed_username_1 and @removed_username_2 were **removed from the channel**."
+    message="@removed_username_1 was **removed from the channel**."
     options={
       Object {
         "atMentions": true,
@@ -160,7 +160,7 @@ exports[`components/post_view/CombinedSystemMessage should match snapshot, combi
             "key": "@removed_username_1",
           },
           Object {
-            "key": "@removed_username_2",
+            "key": undefined,
           },
           Object {
             "key": "you",
@@ -171,6 +171,28 @@ exports[`components/post_view/CombinedSystemMessage should match snapshot, combi
     }
   />
   <br />
+  <Connect(Markdown)
+    message="@removed_username_2 was **removed from the channel**."
+    options={
+      Object {
+        "atMentions": true,
+        "mentionHighlight": false,
+        "mentionKeys": Array [
+          Object {
+            "key": "@removed_username_2",
+          },
+          Object {
+            "key": undefined,
+          },
+          Object {
+            "key": "Someone",
+          },
+        ],
+        "singleline": true,
+      }
+    }
+  />
+  <br />
 </Fragment>
 `;
 
@@ -198,24 +220,18 @@ exports[`components/post_view/CombinedSystemMessage should match snapshot, when
     }
   />
   <br />
-  <injectIntl(LastUsers)
-    actor="you"
-    expandedLocale={
-      Object {
-        "defaultMessage": "{users} and {lastUser} were **removed from the channel**.",
-        "id": "combined_system_message.removed_from_channel.many_expanded",
-      }
-    }
-    formatOptions={
+  <Connect(Markdown)
+    message="@removed_username_1 and @removed_username_2 were **removed from the channel**."
+    options={
       Object {
         "atMentions": true,
         "mentionHighlight": false,
         "mentionKeys": Array [
           Object {
-            "key": "You",
+            "key": "@removed_username_1",
           },
           Object {
-            "key": "@removed_username_1",
+            "key": "@removed_username_2",
           },
           Object {
             "key": "you",
@@ -224,13 +240,27 @@ exports[`components/post_view/CombinedSystemMessage should match snapshot, when
         "singleline": true,
       }
     }
-    postType="system_remove_from_channel"
-    usernames={
-      Array [
-        "You",
-        "@removed_username_1",
-        "@removed_username_2",
-      ]
+  />
+  <br />
+  <Connect(Markdown)
+    message="You and @removed_username_2 were **removed from the channel**."
+    options={
+      Object {
+        "atMentions": true,
+        "mentionHighlight": false,
+        "mentionKeys": Array [
+          Object {
+            "key": "You",
+          },
+          Object {
+            "key": "@removed_username_2",
+          },
+          Object {
+            "key": "Someone",
+          },
+        ],
+        "singleline": true,
+      }
     }
   />
   <br />