diff --git a/src/components/sidebarRight/tabs/sharedMedia.ts b/src/components/sidebarRight/tabs/sharedMedia.ts
index b2eff4e6..57980304 100644
--- a/src/components/sidebarRight/tabs/sharedMedia.ts
+++ b/src/components/sidebarRight/tabs/sharedMedia.ts
@@ -245,6 +245,8 @@ export default class AppSharedMediaTab implements SliderTab {
         }
       }
     }
+
+    this.scroll.onScroll();
   }
 
   private onTransitionStart = () => {
diff --git a/src/lib/appManagers/appImManager.ts b/src/lib/appManagers/appImManager.ts
index 8bc17b76..84c8d177 100644
--- a/src/lib/appManagers/appImManager.ts
+++ b/src/lib/appManagers/appImManager.ts
@@ -340,7 +340,8 @@ export class AppImManager {
       const peerID = e.detail;
 
       if(peerID == this.peerID) {
-        (this.messagesQueuePromise || Promise.resolve()).then(() => {
+        const promise: Promise<any> = this.setPeerPromise || this.messagesQueuePromise || Promise.resolve();
+        promise.then(() => {
           this.setPinnedMessage();
         });
       }