diff --git a/desktop/src/main/java/org/example/petshopdesktop/api/ChatRealtimeClient.java b/desktop/src/main/java/org/example/petshopdesktop/api/ChatRealtimeClient.java
index d29d3aab..93f90a73 100644
--- a/desktop/src/main/java/org/example/petshopdesktop/api/ChatRealtimeClient.java
+++ b/desktop/src/main/java/org/example/petshopdesktop/api/ChatRealtimeClient.java
@@ -90,8 +90,9 @@ public class ChatRealtimeClient implements WebSocket.Listener {
             for (ConversationResponse conv : globalConversations.values()) {
                 if ("CLOSED".equals(conv.getStatus())) continue;
                 
-                // Needs pickup
-                if (conv.getHumanRequestedAt() != null && conv.getStaffId() == null) {
+                // Needs pickup - only if we haven't already replied
+                if (conv.getHumanRequestedAt() != null && conv.getStaffId() == null
+                        && (currentUserId == null || !currentUserId.equals(conv.getLastSenderId()))) {
                     return true;
                 }