diff --git a/web/avatars/edit-user-avatar.react.js b/web/avatars/edit-user-avatar.react.js
index 626235a26..e6658a395 100644
--- a/web/avatars/edit-user-avatar.react.js
+++ b/web/avatars/edit-user-avatar.react.js
@@ -1,38 +1,38 @@
 // @flow
 
 import invariant from 'invariant';
 import * as React from 'react';
 
 import { EditUserAvatarContext } from 'lib/components/base-edit-user-avatar-provider.react.js';
 
 import EditUserAvatarMenu from './edit-user-avatar-menu.react.js';
 import css from './edit-user-avatar.css';
 import UserAvatar from './user-avatar.react.js';
 import LoadingIndicator from '../loading-indicator.react.js';
 
 const loadingSpinner = <LoadingIndicator status="loading" size="large" />;
 
 type Props = {
   +userID: ?string,
   +disabled?: boolean,
 };
 function EditUserAvatar(props: Props): React.Node {
   const editUserAvatarContext = React.useContext(EditUserAvatarContext);
   invariant(editUserAvatarContext, 'editUserAvatarContext should be set');
 
   const { userAvatarSaveInProgress } = editUserAvatarContext;
 
   const { userID } = props;
 
   return (
     <div className={css.editUserAvatarContainer}>
       <div className={css.editAvatarLoadingSpinner}>
         {userAvatarSaveInProgress ? loadingSpinner : null}
       </div>
       <UserAvatar userID={userID} size="profile" />
-      <EditUserAvatarMenu />
+      {!userAvatarSaveInProgress ? <EditUserAvatarMenu /> : null}
     </div>
   );
 }
 
 export default EditUserAvatar;