diff --git a/native/avatars/emoji-avatar-creation.react.js b/native/avatars/emoji-avatar-creation.react.js
--- a/native/avatars/emoji-avatar-creation.react.js
+++ b/native/avatars/emoji-avatar-creation.react.js
@@ -17,21 +17,16 @@
 import Avatar from './avatar.react.js';
 import Button from '../components/button.react.js';
 import ColorRows from '../components/color-rows.react.js';
-import { useSelector } from '../redux/redux-utils.js';
-import type { AppState } from '../redux/state-types.js';
 import { useStyles } from '../themes/colors.js';
 
 type Props = {
   +saveAvatarCall: (newAvatarRequest: UpdateUserAvatarRequest) => mixed,
   +saveAvatarCallLoading: boolean,
-  +savedEmojiAvatarSelector: (state: AppState) => () => ClientEmojiAvatar,
+  +savedEmojiAvatarFunc: () => ClientEmojiAvatar,
 };
 
 function EmojiAvatarCreation(props: Props): React.Node {
-  const { saveAvatarCall, saveAvatarCallLoading, savedEmojiAvatarSelector } =
-    props;
-
-  const savedEmojiAvatarFunc = useSelector(savedEmojiAvatarSelector);
+  const { saveAvatarCall, saveAvatarCallLoading, savedEmojiAvatarFunc } = props;
 
   const [pendingEmoji, setPendingEmoji] = React.useState<string>(
     () => savedEmojiAvatarFunc().emoji,
diff --git a/native/chat/settings/emoji-thread-avatar-creation.react.js b/native/chat/settings/emoji-thread-avatar-creation.react.js
--- a/native/chat/settings/emoji-thread-avatar-creation.react.js
+++ b/native/chat/settings/emoji-thread-avatar-creation.react.js
@@ -11,6 +11,7 @@
 import type { ChatNavigationProp } from '../../chat/chat.react.js';
 import { displayActionResultModal } from '../../navigation/action-result-modal.js';
 import type { NavigationRoute } from '../../navigation/route-names.js';
+import { useSelector } from '../../redux/redux-utils.js';
 
 export type EmojiThreadAvatarCreationParams = {
   +threadInfo: RawThreadInfo | ThreadInfo,
@@ -28,6 +29,7 @@
     threadID,
     containingThreadID,
   );
+  const savedEmojiAvatarFunc = useSelector(selector);
 
   const editThreadAvatarContext = React.useContext(EditThreadAvatarContext);
   invariant(editThreadAvatarContext, 'editThreadAvatarContext should be set');
@@ -47,7 +49,7 @@
     <EmojiAvatarCreation
       saveAvatarCall={setAvatar}
       saveAvatarCallLoading={threadAvatarSaveInProgress}
-      savedEmojiAvatarSelector={selector}
+      savedEmojiAvatarFunc={savedEmojiAvatarFunc}
     />
   );
 }
diff --git a/native/profile/emoji-user-avatar-creation.react.js b/native/profile/emoji-user-avatar-creation.react.js
--- a/native/profile/emoji-user-avatar-creation.react.js
+++ b/native/profile/emoji-user-avatar-creation.react.js
@@ -8,6 +8,7 @@
 import { EditUserAvatarContext } from '../avatars/edit-user-avatar-provider.react.js';
 import EmojiAvatarCreation from '../avatars/emoji-avatar-creation.react.js';
 import { displayActionResultModal } from '../navigation/action-result-modal.js';
+import { useSelector } from '../redux/redux-utils.js';
 
 // eslint-disable-next-line no-unused-vars
 function EmojiUserAvatarCreation(props: { ... }): React.Node {
@@ -24,11 +25,15 @@
     [setUserAvatar],
   );
 
+  const savedEmojiAvatarFunc = useSelector(
+    savedEmojiAvatarSelectorForCurrentUser,
+  );
+
   return (
     <EmojiAvatarCreation
       saveAvatarCall={setAvatar}
       saveAvatarCallLoading={userAvatarSaveInProgress}
-      savedEmojiAvatarSelector={savedEmojiAvatarSelectorForCurrentUser}
+      savedEmojiAvatarFunc={savedEmojiAvatarFunc}
     />
   );
 }