diff --git a/native/utils/avatar-utils.js b/native/utils/avatar-utils.js
index 5611c3d82..c26d02a08 100644
--- a/native/utils/avatar-utils.js
+++ b/native/utils/avatar-utils.js
@@ -1,59 +1,104 @@
 // @flow
 
 import * as React from 'react';
 import { Alert } from 'react-native';
 
+import {
+  changeThreadSettings,
+  changeThreadSettingsActionTypes,
+} from 'lib/actions/thread-actions.js';
 import {
   updateUserAvatar,
   updateUserAvatarActionTypes,
 } from 'lib/actions/user-actions.js';
 import type { ClientEmojiAvatar } from 'lib/types/avatar-types.js';
 import {
   useServerCall,
   useDispatchActionPromise,
 } from 'lib/utils/action-utils.js';
 
 import { FeatureFlagsContext } from '../components/feature-flags-provider.react.js';
 import { displayActionResultModal } from '../navigation/action-result-modal.js';
 
 function useShouldRenderAvatars(): boolean {
   const { configuration: featureFlagConfig } =
     React.useContext(FeatureFlagsContext);
 
   return !!featureFlagConfig['AVATARS_DISPLAY'];
 }
 
 function useSaveUserAvatar(): (
   newEmojiAvatarRequest: ClientEmojiAvatar,
 ) => mixed {
   const callUpdateUserAvatar = useServerCall(updateUserAvatar);
   const dispatchActionPromise = useDispatchActionPromise();
 
   return React.useCallback(
     newEmojiAvatarRequest => {
       const saveAvatarPromise = (async () => {
         try {
           const response = await callUpdateUserAvatar(newEmojiAvatarRequest);
           displayActionResultModal('Avatar updated!');
 
           return response;
         } catch (e) {
           Alert.alert(
             'Couldn’t save avatar',
             'Please try again later',
             [{ text: 'OK' }],
             {
               cancelable: true,
             },
           );
           throw e;
         }
       })();
 
       dispatchActionPromise(updateUserAvatarActionTypes, saveAvatarPromise);
     },
     [callUpdateUserAvatar, dispatchActionPromise],
   );
 }
 
-export { useShouldRenderAvatars, useSaveUserAvatar };
+function useSaveThreadAvatar(): (
+  newEmojiAvatarRequest: ClientEmojiAvatar,
+  threadID: string,
+) => mixed {
+  const callChangeThreadSettings = useServerCall(changeThreadSettings);
+  const dispatchActionPromise = useDispatchActionPromise();
+
+  return React.useCallback(
+    (newEmojiAvatarRequest, threadID) => {
+      const saveAvatarPromise = (async () => {
+        try {
+          const response = await callChangeThreadSettings({
+            threadID,
+            changes: { avatar: newEmojiAvatarRequest },
+          });
+          displayActionResultModal('Avatar updated!');
+
+          return response;
+        } catch (e) {
+          Alert.alert(
+            'Couldn’t save avatar',
+            'Please try again later',
+            [{ text: 'OK' }],
+            {
+              cancelable: true,
+            },
+          );
+          throw e;
+        }
+      })();
+
+      dispatchActionPromise(
+        changeThreadSettingsActionTypes,
+        saveAvatarPromise,
+        { customKeyName: `${changeThreadSettingsActionTypes.started}:avatar` },
+      );
+    },
+    [callChangeThreadSettings, dispatchActionPromise],
+  );
+}
+
+export { useShouldRenderAvatars, useSaveUserAvatar, useSaveThreadAvatar };