diff --git a/ts/components/AvatarPopup.stories.tsx b/ts/components/AvatarPopup.stories.tsx
index 233ef207c1..c6c34d25d9 100644
--- a/ts/components/AvatarPopup.stories.tsx
+++ b/ts/components/AvatarPopup.stories.tsx
@@ -41,7 +41,6 @@ const createProps = (overrideProps: Partial<Props> = {}): Props => ({
   name: text('name', overrideProps.name || ''),
   noteToSelf: boolean('noteToSelf', overrideProps.noteToSelf || false),
   onEditProfile: action('onEditProfile'),
-  onClick: action('onClick'),
   onSetChatColor: action('onSetChatColor'),
   onViewArchive: action('onViewArchive'),
   onViewPreferences: action('onViewPreferences'),
diff --git a/ts/components/AvatarPopup.tsx b/ts/components/AvatarPopup.tsx
index 192f6f61c0..9931423268 100644
--- a/ts/components/AvatarPopup.tsx
+++ b/ts/components/AvatarPopup.tsx
@@ -1,4 +1,4 @@
-// Copyright 2019-2020 Signal Messenger, LLC
+// Copyright 2019-2021 Signal Messenger, LLC
 // SPDX-License-Identifier: AGPL-3.0-only
 
 import * as React from 'react';
@@ -20,7 +20,7 @@ export type Props = {
   // Matches Popper's RefHandler type
   innerRef?: React.Ref<HTMLDivElement>;
   style: React.CSSProperties;
-} & AvatarProps;
+} & Omit<AvatarProps, 'onClick'>;
 
 export const AvatarPopup = (props: Props): JSX.Element => {
   const {