diff --git a/src/components/chat/bubbles.ts b/src/components/chat/bubbles.ts
index dd085bc7..f433a9c9 100644
--- a/src/components/chat/bubbles.ts
+++ b/src/components/chat/bubbles.ts
@@ -1548,12 +1548,12 @@ export default class ChatBubbles {
       ({rect}) => {
         let height = windowSize.windowH;
         height -= this.chat.topbar.container.getBoundingClientRect().height;
-        height -= 78;
+        height -= mediaSizes.isMobile ? 58 : 78; // TODO: change height to mobile when ESG is bottom
         return height;
 
-        const rowsWrapperHeight = this.chat.input.rowsWrapper.getBoundingClientRect().height;
+        /* const rowsWrapperHeight = this.chat.input.rowsWrapper.getBoundingClientRect().height;
         const diff = rowsWrapperHeight - 54;
-        return rect.height + diff;
+        return rect.height + diff; */
       }
     );
   }
diff --git a/src/lib/appManagers/appWebPagesManager.ts b/src/lib/appManagers/appWebPagesManager.ts
index bc783741..0bdaa8ab 100644
--- a/src/lib/appManagers/appWebPagesManager.ts
+++ b/src/lib/appManagers/appWebPagesManager.ts
@@ -44,11 +44,9 @@ export class AppWebPagesManager {
     const {id} = apiWebPage;
 
     const oldWebPage = this.webpages[id];
-    if(oldWebPage && 
+    const isUpdated = oldWebPage && 
       oldWebPage._ === apiWebPage._ && 
-      (oldWebPage as WebPage.webPage).hash === (oldWebPage as WebPage.webPage).hash) {
-      return oldWebPage;
-    }
+      (oldWebPage as WebPage.webPage).hash === (oldWebPage as WebPage.webPage).hash;
 
     if(apiWebPage._ === 'webPage') {
       if(apiWebPage.photo?._ === 'photo') {
@@ -110,7 +108,7 @@ export class AppWebPagesManager {
       safeReplaceObject(oldWebPage, apiWebPage);
     }
     
-    if(!messageKey && pendingSet !== undefined) {
+    if(!messageKey && pendingSet !== undefined && isUpdated) {
       const msgs: {peerId: PeerId, mid: number, isScheduled: boolean}[] = [];
       pendingSet.forEach((value) => {
         const [peerId, mid, isScheduled] = value.split('_');