diff --git a/jam-ui/src/components/client/chat/JKChatComposer.js b/jam-ui/src/components/client/chat/JKChatComposer.js
index e8bd44734..8a6dc1f20 100644
--- a/jam-ui/src/components/client/chat/JKChatComposer.js
+++ b/jam-ui/src/components/client/chat/JKChatComposer.js
@@ -1,4 +1,5 @@
 import React, { useState, useCallback, useMemo } from 'react';
+import PropTypes from 'prop-types';
 import { useDispatch, useSelector } from 'react-redux';
 import { sendMessage, selectSendStatus, selectSendError, clearSendError } from '../../../store/features/sessionChatSlice';
 import { selectSessionId } from '../../../store/features/activeSessionSlice';
@@ -221,4 +222,12 @@ const JKChatComposer = ({ textareaRef }) => {
   );
 };
 
+JKChatComposer.propTypes = {
+  textareaRef: PropTypes.object
+};
+
+JKChatComposer.defaultProps = {
+  textareaRef: null
+};
+
 export default React.memo(JKChatComposer);
diff --git a/jam-ui/src/components/client/chat/JKChatEmptyState.js b/jam-ui/src/components/client/chat/JKChatEmptyState.js
index 8d8894c8d..91ba47a8b 100644
--- a/jam-ui/src/components/client/chat/JKChatEmptyState.js
+++ b/jam-ui/src/components/client/chat/JKChatEmptyState.js
@@ -22,7 +22,7 @@ const JKChatEmptyState = () => {
         No messages yet
       </p>
       <p style={{ fontSize: '14px', margin: 0 }}>
-        Be the first to send a message in this chat!
+        Start the conversation!
       </p>
     </div>
   );