diff --git a/src/components/chat/bubbles.ts b/src/components/chat/bubbles.ts
index 93c42df2..884e18fa 100644
--- a/src/components/chat/bubbles.ts
+++ b/src/components/chat/bubbles.ts
@@ -998,8 +998,8 @@ export default class ChatBubbles {
     if(nameDiv && nameDiv !== bubble) {
       target = nameDiv || target;
       const peerIdStr = target.dataset.peerId || target.getAttribute('peer');
-      if(typeof(peerIdStr) === 'string') {
-        const savedFrom = target.dataset.savedFrom;
+      const savedFrom = target.dataset.savedFrom;
+      if(typeof(peerIdStr) === 'string' || savedFrom) {
         if(savedFrom) {
           const [peerId, mid] = savedFrom.split('_');