diff --git a/app/containers/message/Components/RightIcons/ReadReceipt.tsx b/app/containers/message/Components/RightIcons/ReadReceipt.tsx
index 3a361bf7b..e7b8f87b5 100644
--- a/app/containers/message/Components/RightIcons/ReadReceipt.tsx
+++ b/app/containers/message/Components/RightIcons/ReadReceipt.tsx
@@ -5,7 +5,7 @@ import { CustomIcon } from '../../../CustomIcon';
 import styles from '../../styles';
 import { useTheme } from '../../../../theme';
 
-const ReadReceipt = React.memo(({ isReadReceiptEnabled, unread }: { isReadReceiptEnabled?: boolean; unread: boolean }) => {
+const ReadReceipt = React.memo(({ isReadReceiptEnabled, unread }: { isReadReceiptEnabled?: boolean; unread?: boolean }) => {
 	const { theme } = useTheme();
 	if (isReadReceiptEnabled && !unread && unread !== null) {
 		return <CustomIcon name='check' color={themes[theme].tintColor} size={16} style={styles.rightIcons} />;
diff --git a/app/containers/message/Components/RightIcons/index.tsx b/app/containers/message/Components/RightIcons/index.tsx
index d2e1f5158..fb96aaaf5 100644
--- a/app/containers/message/Components/RightIcons/index.tsx
+++ b/app/containers/message/Components/RightIcons/index.tsx
@@ -17,8 +17,8 @@ interface IRightIcons {
 	type: MessageType;
 	msg?: string;
 	isEdited: boolean;
-	isReadReceiptEnabled: boolean;
-	unread: boolean;
+	isReadReceiptEnabled?: boolean;
+	unread?: boolean;
 	hasError: boolean;
 }
 
@@ -27,7 +27,7 @@ const RightIcons = ({ type, msg, isEdited, hasError, isReadReceiptEnabled, unrea
 		<Encrypted type={type} />
 		<Edited testID={`${msg}-edited`} isEdited={isEdited} />
 		<MessageError hasError={hasError} />
-		<ReadReceipt isReadReceiptEnabled={isReadReceiptEnabled} unread={unread || false} />
+		<ReadReceipt isReadReceiptEnabled={isReadReceiptEnabled} unread={unread} />
 	</View>
 );
 
diff --git a/app/containers/message/Message.tsx b/app/containers/message/Message.tsx
index 8b6906507..d6c706cbf 100644
--- a/app/containers/message/Message.tsx
+++ b/app/containers/message/Message.tsx
@@ -97,8 +97,8 @@ const Message = React.memo((props: IMessage) => {
 						msg={props.msg}
 						isEdited={props.isEdited}
 						hasError={props.hasError}
-						isReadReceiptEnabled={props.isReadReceiptEnabled || false}
-						unread={props.unread || false}
+						isReadReceiptEnabled={props.isReadReceiptEnabled}
+						unread={props.unread}
 					/>
 				) : null}
 			</View>
diff --git a/app/containers/message/User.tsx b/app/containers/message/User.tsx
index 2d908ac7c..2ecf99611 100644
--- a/app/containers/message/User.tsx
+++ b/app/containers/message/User.tsx
@@ -114,8 +114,8 @@ const User = React.memo(
 						type={type}
 						isEdited={isEdited}
 						hasError={hasError}
-						isReadReceiptEnabled={props.isReadReceiptEnabled || false}
-						unread={props.unread || false}
+						isReadReceiptEnabled={props.isReadReceiptEnabled}
+						unread={props.unread}
 					/>
 				</View>
 			);