diff --git a/app/containers/Avatar/index.tsx b/app/containers/Avatar/index.tsx
index 3fb84d216..e9a3541ac 100644
--- a/app/containers/Avatar/index.tsx
+++ b/app/containers/Avatar/index.tsx
@@ -65,6 +65,7 @@ class AvatarContainer extends React.Component<Partial<IAvatar>, any> {
 				if (this.mounted) {
 					this.setState({ avatarETag });
 				} else {
+				// @ts-ignore
 					this.state.avatarETag = avatarETag;
 				}
 			});
diff --git a/app/containers/BackgroundContainer/index.tsx b/app/containers/BackgroundContainer/index.tsx
index b6580de21..21324d791 100644
--- a/app/containers/BackgroundContainer/index.tsx
+++ b/app/containers/BackgroundContainer/index.tsx
@@ -36,9 +36,8 @@ const BackgroundContainer = ({ theme, text, loading }: IBackgroundContainer) =>
 	<View style={styles.container}>
 		<ImageBackground source={{ uri: `message_empty_${ theme }` }} style={styles.image} />
 		{text ? <Text style={[styles.text, { color: themes[theme].auxiliaryTintColor }]}>{text}</Text> : null}
-		{/*{loading ? <ActivityIndicator style={[styles.text, { color: themes[theme].auxiliaryTintColor }]} /> : null}*/}
-		{loading ? <ActivityIndicator color={themes[theme].auxiliaryTintColor} style={styles.text} /> : null}
-
+		{/*@ts-ignore*/}
+		{loading ? <ActivityIndicator style={[styles.text, { color: themes[theme].auxiliaryTintColor }]} /> : null}
 	</View>
 );
 
diff --git a/app/containers/EmojiPicker/EmojiCategory.tsx b/app/containers/EmojiPicker/EmojiCategory.tsx
index 7c6fbce76..69feafc93 100644
--- a/app/containers/EmojiPicker/EmojiCategory.tsx
+++ b/app/containers/EmojiPicker/EmojiCategory.tsx
@@ -54,6 +54,7 @@ class EmojiCategory extends React.Component<IEmoji> {
 		const marginHorizontal = (width - (numColumns * EMOJI_SIZE)) / 2;
 
 		return (
+			// @ts-ignore
 			<FlatList
 				contentContainerStyle={{ marginHorizontal }}
 				// rerender FlatList in case of width changes