diff --git a/src/lib/appManagers/appMessagesManager.ts b/src/lib/appManagers/appMessagesManager.ts
index e559df9a..4642b2ca 100644
--- a/src/lib/appManagers/appMessagesManager.ts
+++ b/src/lib/appManagers/appMessagesManager.ts
@@ -2000,8 +2000,8 @@ export class AppMessagesManager {
         message.fwd_from = this.generateForwardHeader(peerId, originalMessage);
         keys.push('views', 'forwards');
 
-        if(message.fwd_from.from_name) {
-          message
+        if(message.fwd_from?.from_name) {
+          delete message.from_id;
         }
       }