diff --git a/src/common/component/Message/ForwardedMessage.tsx b/src/common/component/Message/ForwardedMessage.tsx
index 12e43b0a..859fb4b3 100644
--- a/src/common/component/Message/ForwardedMessage.tsx
+++ b/src/common/component/Message/ForwardedMessage.tsx
@@ -63,7 +63,7 @@ const ForwardedMessage: FC<Props> = ({ context, to, from_uid, id }) => {
                 <StyledMsg className="archive" key={idx}>
                   {user && (
                     <div className="avatar">
-                      <Avatar width={40} height={40} src={user.avatar} name={user.name} />
+                      <Avatar width={24} height={24} src={user.avatar} name={user.name} />
                     </div>
                   )}
                   <div className="details">
diff --git a/src/common/component/User/index.tsx b/src/common/component/User/index.tsx
index a8523e51..673223e2 100644
--- a/src/common/component/User/index.tsx
+++ b/src/common/component/User/index.tsx
@@ -59,7 +59,13 @@ const User: FC<Props> = ({
           onContextMenu={enableContextMenu ? handleContextMenuEvent : undefined}
         >
           <div className="avatar">
-            <Avatar src={curr.avatar} name={curr.name} alt="avatar" />
+            <Avatar
+              width={avatarSize}
+              height={avatarSize}
+              src={curr.avatar}
+              name={curr.name}
+              alt="avatar"
+            />
             <div className={`status ${online ? "online" : "offline"}`}></div>
           </div>
           {!compact && (