diff --git a/lib/types/avatar-types.js b/lib/types/avatar-types.js
index b8872df2f..2ecaee69b 100644
--- a/lib/types/avatar-types.js
+++ b/lib/types/avatar-types.js
@@ -1,81 +1,98 @@
 // @flow
 
 import t, { type TUnion, type TInterface } from 'tcomb';
 
 import type { CreateUpdatesResult } from './update-types.js';
 import { validHexColorRegex } from '../shared/account-utils.js';
 import { onlyOneEmojiRegex } from '../shared/emojis.js';
 import { tRegex, tShape, tString } from '../utils/validation-utils.js';
 
 export type EmojiAvatarDBContent = {
   +type: 'emoji',
   +emoji: string,
   +color: string, // hex, without "#" or "0x"
 };
 export const emojiAvatarDBContentValidator: TInterface<EmojiAvatarDBContent> =
   tShape<EmojiAvatarDBContent>({
     type: tString('emoji'),
     emoji: tRegex(onlyOneEmojiRegex),
     color: tRegex(validHexColorRegex),
   });
 
 export type ImageAvatarDBContent = {
   +type: 'image',
   +uploadID: string,
 };
 
+export type EncryptedImageAvatarDBContent = {
+  +type: 'encrypted_image',
+  +uploadID: string,
+};
+
 export type ENSAvatarDBContent = {
   +type: 'ens',
 };
 export const ensAvatarDBContentValidator: TInterface<ENSAvatarDBContent> =
   tShape({ type: tString('ens') });
 
 export type AvatarDBContent =
   | EmojiAvatarDBContent
   | ImageAvatarDBContent
+  | EncryptedImageAvatarDBContent
   | ENSAvatarDBContent;
 
 export type UpdateUserAvatarRemoveRequest = { +type: 'remove' };
 
 export type UpdateUserAvatarRequest =
   | AvatarDBContent
   | UpdateUserAvatarRemoveRequest;
 
 export type ClientEmojiAvatar = EmojiAvatarDBContent;
 const clientEmojiAvatarValidator = emojiAvatarDBContentValidator;
 
 export type ClientImageAvatar = {
   +type: 'image',
   +uri: string,
 };
 const clientImageAvatarValidator = tShape<ClientImageAvatar>({
   type: tString('image'),
   uri: t.String,
 });
 
+export type ClientEncryptedImageAvatar = {
+  +type: 'encrypted_image',
+  +blobURI: string,
+  +encryptionKey: string,
+  +thumbHash: ?string,
+};
+
 export type ClientENSAvatar = ENSAvatarDBContent;
 const clientENSAvatarValidator = ensAvatarDBContentValidator;
 
 export type ClientAvatar =
   | ClientEmojiAvatar
   | ClientImageAvatar
+  | ClientEncryptedImageAvatar
   | ClientENSAvatar;
 export const clientAvatarValidator: TUnion<ClientAvatar> = t.union([
   clientEmojiAvatarValidator,
   clientImageAvatarValidator,
   clientENSAvatarValidator,
 ]);
 
-export type ResolvedClientAvatar = ClientEmojiAvatar | ClientImageAvatar;
+export type ResolvedClientAvatar =
+  | ClientEmojiAvatar
+  | ClientImageAvatar
+  | ClientEncryptedImageAvatar;
 
 export type UpdateUserAvatarResponse = {
   +updates: CreateUpdatesResult,
 };
 
 export type GenericUserInfoWithAvatar = {
   +username?: ?string,
   +avatar?: ?ClientAvatar,
   ...
 };
 
 export type AvatarSize = 'XS' | 'S' | 'M' | 'L' | 'XL' | 'XXL';