diff --git a/app/containers/Avatar/Avatar.tsx b/app/containers/Avatar/Avatar.tsx
index 4c0d741dd..7b78bd19c 100644
--- a/app/containers/Avatar/Avatar.tsx
+++ b/app/containers/Avatar/Avatar.tsx
@@ -6,7 +6,7 @@ import { settings as RocketChatSettings } from '@rocket.chat/sdk';
 
 import { avatarURL } from '../../utils/avatar';
 import Emoji from '../markdown/Emoji';
-import {IAvatar} from "./interfaces";
+import {IAvatar} from './interfaces';
 
 const Avatar = React.memo(({
 	server,
@@ -23,7 +23,7 @@ const Avatar = React.memo(({
 	rid,
 	blockUnauthenticatedAccess,
 	serverVersion,
-    text = '',
+    text,
     size = 25,
     borderRadius = 4,
     type = 'd',
diff --git a/app/containers/EmojiPicker/EmojiCategory.tsx b/app/containers/EmojiPicker/EmojiCategory.tsx
index 452181f1b..436f9c4ce 100644
--- a/app/containers/EmojiPicker/EmojiCategory.tsx
+++ b/app/containers/EmojiPicker/EmojiCategory.tsx
@@ -7,7 +7,7 @@ import CustomEmoji from './CustomEmoji';
 import scrollPersistTaps from '../../utils/scrollPersistTaps';
 import {IEmoji, IEmojiCategory} from "./interfaces";
 
-const EMOJI_SIZE: number = 50;
+const EMOJI_SIZE = 50;
 
 const renderEmoji = (emoji: IEmoji, size: number, baseUrl: string) => {
 	if (emoji && emoji.isCustom) {
diff --git a/app/containers/EmojiPicker/index.tsx b/app/containers/EmojiPicker/index.tsx
index 876e671bc..bb2d47447 100644
--- a/app/containers/EmojiPicker/index.tsx
+++ b/app/containers/EmojiPicker/index.tsx
@@ -25,7 +25,6 @@ const scrollProps = {
 };
 
 interface IEmojiPickerProps {
-	literal: string;
 	isMessageContainsOnlyEmoji: boolean;
 	getCustomEmoji?: Function;
 	baseUrl: string;
diff --git a/app/containers/RoomHeader/RoomHeader.tsx b/app/containers/RoomHeader/RoomHeader.tsx
index fbe48cd6f..33b0d37cf 100644
--- a/app/containers/RoomHeader/RoomHeader.tsx
+++ b/app/containers/RoomHeader/RoomHeader.tsx
@@ -76,9 +76,9 @@ interface IRoomHeader {
 const SubTitle = React.memo(({ usersTyping, subtitle, renderFunc, theme, scale }: TRoomHeaderSubTitle) => {
 	const fontSize = getSubTitleSize(scale);
 	// typing
-	if (usersTyping?.length) {
+	if (usersTyping.length) {
 		let usersText;
-		if (usersTyping?.length === 2) {
+		if (usersTyping.length === 2) {
 			usersText = usersTyping.join(` ${ I18n.t('and') } `);
 		} else {
 			usersText = usersTyping.join(', ');
@@ -147,7 +147,7 @@ const Header = React.memo(({
 	let scale = 1;
 
 	if (!portrait && !tmid) {
-		if (usersTyping?.length > 0 || subtitle) {
+		if (usersTyping.length > 0 || subtitle) {
 			scale = 0.8;
 		}
 	}
diff --git a/app/containers/markdown/Emoji.tsx b/app/containers/markdown/Emoji.tsx
index 8ca9ee62f..cda761b74 100644
--- a/app/containers/markdown/Emoji.tsx
+++ b/app/containers/markdown/Emoji.tsx
@@ -7,7 +7,6 @@ import { themes } from '../../constants/colors';
 
 import styles from './styles';
 
-// TODO this interface it's duplicated with 'app/containers/EmojiPicker/index.tsx'
 interface IEmoji {
 	literal: string;
 	isMessageContainsOnlyEmoji: boolean;