diff --git a/src/components/middle/composer/Composer.scss b/src/components/middle/composer/Composer.scss
index 3690a167e..7198cc6bd 100644
--- a/src/components/middle/composer/Composer.scss
+++ b/src/components/middle/composer/Composer.scss
@@ -189,7 +189,7 @@
   }
 
   @media (max-width: 600px) {
-    max-width: calc(100% - 3rem);
+    max-width: calc(100% - 3.375rem);
   }
 }
 
diff --git a/src/components/middle/composer/WebPagePreview.tsx b/src/components/middle/composer/WebPagePreview.tsx
index 6505e6b7c..3e7b38ba9 100644
--- a/src/components/middle/composer/WebPagePreview.tsx
+++ b/src/components/middle/composer/WebPagePreview.tsx
@@ -79,7 +79,7 @@ const WebPagePreview: FC<OwnProps & StateProps & DispatchProps> = ({
   const isShown = Boolean(webPagePreview && messageText.length && !noWebPage && !disabled);
   const { shouldRender, transitionClassNames } = useShowTransition(isShown);
 
-  const renderingWebPage = useCurrentOrPrev(webPagePreview);
+  const renderingWebPage = useCurrentOrPrev(webPagePreview, true);
 
   if (!shouldRender || !renderingWebPage) {
     return undefined;