diff --git a/ts/components/conversation/InviteContactsDialog.tsx b/ts/components/conversation/InviteContactsDialog.tsx
index b8e3848fa..7f9bb7914 100644
--- a/ts/components/conversation/InviteContactsDialog.tsx
+++ b/ts/components/conversation/InviteContactsDialog.tsx
@@ -178,7 +178,7 @@ const InviteContactsDialogInner = (props: Props) => {
     return members.map((member: ContactType, index: number) => (
       <SessionMemberListItem
         member={member}
-        key={index}
+        key={member.id}
         index={index}
         isSelected={selectedContacts.some(m => m === member.id)}
         onSelect={(selectedMember: ContactType) => {
diff --git a/ts/components/conversation/ModeratorsRemoveDialog.tsx b/ts/components/conversation/ModeratorsRemoveDialog.tsx
index 30d6d10d3..5d85955b1 100644
--- a/ts/components/conversation/ModeratorsRemoveDialog.tsx
+++ b/ts/components/conversation/ModeratorsRemoveDialog.tsx
@@ -102,7 +102,7 @@ export class RemoveModeratorsDialog extends React.Component<Props, State> {
     return members.map((member: ContactType, index: number) => (
       <SessionMemberListItem
         member={member}
-        key={index}
+        key={member.id}
         index={index}
         isSelected={selectedContacts.some(m => m === member.id)}
         onSelect={(selectedMember: ContactType) => {
diff --git a/ts/components/session/LeftPaneSettingSection.tsx b/ts/components/session/LeftPaneSettingSection.tsx
index ff3233d5d..107fe1fb3 100644
--- a/ts/components/session/LeftPaneSettingSection.tsx
+++ b/ts/components/session/LeftPaneSettingSection.tsx
@@ -128,7 +128,7 @@ const LeftPaneBottomButtons = () => {
   const showRecoveryPhrase = window.i18n('showRecoveryPhrase');
 
   return (
-    <div className="left-pane-setting-bottom-buttons">
+    <div className="left-pane-setting-bottom-buttons" key={1}>
       <SessionButton
         text={dangerButtonText}
         buttonType={SessionButtonType.SquareOutline}
diff --git a/ts/components/session/conversation/SessionCompositionBox.tsx b/ts/components/session/conversation/SessionCompositionBox.tsx
index aa9ec4598..fd0a94882 100644
--- a/ts/components/session/conversation/SessionCompositionBox.tsx
+++ b/ts/components/session/conversation/SessionCompositionBox.tsx
@@ -423,6 +423,7 @@ export class SessionCompositionBox extends React.Component<Props, State> {
             <SessionMemberListItem
               isSelected={focused}
               index={index++}
+              key={suggestion.id}
               member={{
                 id: `${suggestion.id}`,
                 authorPhoneNumber: `${suggestion.id}`,
diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts
index c71b18690..8e300fa6f 100644
--- a/ts/state/ducks/conversations.ts
+++ b/ts/state/ducks/conversations.ts
@@ -169,7 +169,6 @@ export interface ConversationType {
   name?: string;
   profileName?: string;
   hasNickname: boolean;
-  index?: number;
 
   activeAt?: number;
   lastMessage?: LastMessageType;
diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts
index 3a845b76e..b1d6a6d59 100644
--- a/ts/state/selectors/conversations.ts
+++ b/ts/state/selectors/conversations.ts
@@ -121,8 +121,6 @@ export const _getLeftPaneLists = (
       };
     }
 
-    // conversation.index = index;
-
     // Add Open Group to list as soon as the name has been set
     if (conversation.isPublic && (!conversation.name || conversation.name === 'Unknown group')) {
       continue;