diff --git a/jam-ui/src/components/client/chat/JKChatEmptyState.js b/jam-ui/src/components/client/chat/JKChatEmptyState.js
new file mode 100644
index 000000000..8d8894c8d
--- /dev/null
+++ b/jam-ui/src/components/client/chat/JKChatEmptyState.js
@@ -0,0 +1,31 @@
+import React from 'react';
+
+/**
+ * JKChatEmptyState - Empty state component for chat
+ *
+ * Displays a friendly message when there are no messages in the channel yet.
+ * Used when messagesByChannel[channel] is empty.
+ */
+const JKChatEmptyState = () => {
+  return (
+    <div style={{
+      display: 'flex',
+      flexDirection: 'column',
+      alignItems: 'center',
+      justifyContent: 'center',
+      padding: '48px 24px',
+      color: '#6c757d',
+      textAlign: 'center'
+    }}>
+      <div style={{ fontSize: '48px', marginBottom: '16px' }}>💬</div>
+      <p style={{ fontSize: '16px', fontWeight: 600, marginBottom: '8px' }}>
+        No messages yet
+      </p>
+      <p style={{ fontSize: '14px', margin: 0 }}>
+        Be the first to send a message in this chat!
+      </p>
+    </div>
+  );
+};
+
+export default JKChatEmptyState;
diff --git a/jam-ui/src/components/client/chat/JKChatLoadingSpinner.js b/jam-ui/src/components/client/chat/JKChatLoadingSpinner.js
new file mode 100644
index 000000000..63193b3a3
--- /dev/null
+++ b/jam-ui/src/components/client/chat/JKChatLoadingSpinner.js
@@ -0,0 +1,26 @@
+import React from 'react';
+import { Spinner } from 'reactstrap';
+
+/**
+ * JKChatLoadingSpinner - Loading state component for chat
+ *
+ * Displays a spinner with "Loading messages..." text while fetching chat history.
+ * Used when fetchStatus is 'loading'.
+ */
+const JKChatLoadingSpinner = () => {
+  return (
+    <div style={{
+      display: 'flex',
+      flexDirection: 'column',
+      alignItems: 'center',
+      justifyContent: 'center',
+      padding: '48px 24px',
+      color: '#6c757d'
+    }}>
+      <Spinner color="primary" />
+      <p style={{ marginTop: '16px', fontSize: '14px' }}>Loading messages...</p>
+    </div>
+  );
+};
+
+export default JKChatLoadingSpinner;