diff --git a/qortal-ui-plugins/plugins/core/components/ChatPage.js b/qortal-ui-plugins/plugins/core/components/ChatPage.js
index 19534afd..794b499e 100644
--- a/qortal-ui-plugins/plugins/core/components/ChatPage.js
+++ b/qortal-ui-plugins/plugins/core/components/ChatPage.js
@@ -2916,11 +2916,11 @@ class ChatPage extends LitElement {
 
             if (window.parent.location.protocol === "https:") {
 
-                directSocketLink = `wss://${nodeUrl}/websockets/chat/messages?involving=${window.parent.reduxStore.getState().app.selectedAddress.address}&involving=${cid}&encoding=BASE64`;
+                directSocketLink = `wss://${nodeUrl}/websockets/chat/messages?involving=${window.parent.reduxStore.getState().app.selectedAddress.address}&involving=${cid}&encoding=BASE64&limit=1`;
             } else {
 
                 // Fallback to http
-                directSocketLink = `ws://${nodeUrl}/websockets/chat/messages?involving=${window.parent.reduxStore.getState().app.selectedAddress.address}&involving=${cid}&encoding=BASE64`;
+                directSocketLink = `ws://${nodeUrl}/websockets/chat/messages?involving=${window.parent.reduxStore.getState().app.selectedAddress.address}&involving=${cid}&encoding=BASE64&limit=1`;
             }
 
             this.webSocket  = new WebSocket(directSocketLink);
@@ -3011,11 +3011,11 @@ class ChatPage extends LitElement {
 
             if (window.parent.location.protocol === "https:") {
 
-                groupSocketLink = `wss://${nodeUrl}/websockets/chat/messages?txGroupId=${groupId}&encoding=BASE64`;
+                groupSocketLink = `wss://${nodeUrl}/websockets/chat/messages?txGroupId=${groupId}&encoding=BASE64&limit=1`;
             } else {
 
                 // Fallback to http
-                groupSocketLink = `ws://${nodeUrl}/websockets/chat/messages?txGroupId=${groupId}&encoding=BASE64`;
+                groupSocketLink = `ws://${nodeUrl}/websockets/chat/messages?txGroupId=${groupId}&encoding=BASE64&limit=1`;
             }
 
             this.webSocket = new WebSocket(groupSocketLink);
diff --git a/qortal-ui-plugins/plugins/core/components/ChatScroller.js b/qortal-ui-plugins/plugins/core/components/ChatScroller.js
index 520a21ae..4cba01f6 100644
--- a/qortal-ui-plugins/plugins/core/components/ChatScroller.js
+++ b/qortal-ui-plugins/plugins/core/components/ChatScroller.js
@@ -797,7 +797,7 @@ class MessageTemplate extends LitElement {
                                             class=${this.myAddress !== repliedToData.sender
                                             ? "original-message-sender" 
                                             : "message-data-my-name"}>
-                                             ${repliedToData.senderName ? cropAddress(repliedToData.sender) : ''}
+                                             ${repliedToData.senderName ? repliedToData.senderName : cropAddress(repliedToData.sender) }
                                         </p>
                                         <p class="replied-message">
                                             ${version && version.toString() === '1' ? html`