diff --git a/app/containers/MessageBox/index.tsx b/app/containers/MessageBox/index.tsx
index 5a098635f..1c0f151c9 100644
--- a/app/containers/MessageBox/index.tsx
+++ b/app/containers/MessageBox/index.tsx
@@ -112,6 +112,7 @@ export interface IMessageBoxProps extends IBaseScreen<ChatsStackParamList & Mast
 	serverVersion: string;
 	viewCannedResponsesPermission: boolean;
 	goToCannedResponses: () => void;
+	joined: boolean;
 }
 
 interface IMessageBoxState {
@@ -317,7 +318,8 @@ class MessageBox extends Component<IMessageBoxProps, IMessageBoxState> {
 			permissionToUpload
 		} = this.state;
 
-		const { roomType, replying, editing, isFocused, message, theme, usedCannedResponse, uploadFilePermission } = this.props;
+		const { roomType, replying, editing, isFocused, message, theme, usedCannedResponse, uploadFilePermission, joined } =
+			this.props;
 		if (nextProps.theme !== theme) {
 			return true;
 		}
@@ -327,6 +329,9 @@ class MessageBox extends Component<IMessageBoxProps, IMessageBoxState> {
 		if (nextProps.roomType !== roomType) {
 			return true;
 		}
+		if (nextProps.joined !== joined) {
+			return true;
+		}
 		if (nextProps.replying !== replying) {
 			return true;
 		}
diff --git a/app/views/RoomView/index.tsx b/app/views/RoomView/index.tsx
index 440d3ca3b..4e92737b3 100644
--- a/app/views/RoomView/index.tsx
+++ b/app/views/RoomView/index.tsx
@@ -1419,6 +1419,7 @@ class RoomView extends React.Component<IRoomViewProps, IRoomViewState> {
 				onSubmit={this.handleSendMessage}
 				rid={this.rid}
 				tmid={this.tmid}
+				joined={joined}
 				roomType={room.t}
 				isFocused={navigation.isFocused}
 				theme={theme}