diff --git a/src/renderer/components/ThreadChat.tsx b/src/renderer/components/ThreadChat.tsx
index 57c902d..92236be 100644
--- a/src/renderer/components/ThreadChat.tsx
+++ b/src/renderer/components/ThreadChat.tsx
@@ -186,6 +186,8 @@ export default class ThreadChat extends Component<any, any> {
                 if (prevMessage !== null && prevMessage.author.uid === message.author.uid)
                     return chatBubbles.push(<ChatBubble aminoMessage={message} left={AminoClient.uid !== message.author.uid} />);
             });
+        else
+            chatBubbles.push(<h1 style={{ color: "white" }}>Loading messages...</h1>);
 
         return (
             <div class={classMain}>
diff --git a/src/renderer/components/Threads.tsx b/src/renderer/components/Threads.tsx
index 38a52b3..7eb4e70 100644
--- a/src/renderer/components/Threads.tsx
+++ b/src/renderer/components/Threads.tsx
@@ -100,6 +100,7 @@ export default class Threads extends Component<any, any> {
         if (this.state.isHovering) classes += " " + mainHover;
         return (
             <div className={classes} onMouseEnter={() => { this.setState({ isHovering: true }); }} onMouseLeave={() => { this.setState({ isHovering: false }); }}>
+                {this.state.joinedThreadList.length === 0 ? <h1 style={{color: "white"}}>Loading chats...</h1> : null}
                 {this.state.joinedThreadList.map((thread) => {
                     return ([
                         <ThreadElement thread={thread} onClick={this.openThread.bind(this)} />