diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss
index 94205c7419..b31641a0fd 100644
--- a/app/assets/stylesheets/common/base/onebox.scss
+++ b/app/assets/stylesheets/common/base/onebox.scss
@@ -141,7 +141,7 @@ aside.onebox {
       color: var(--tertiary);
     }
 
-    img {
+    img:not(.avatar) {
       max-height: 170px;
       max-width: 20%;
       @media all and (max-width: 600px) {
diff --git a/plugins/chat/assets/stylesheets/common/chat-onebox.scss b/plugins/chat/assets/stylesheets/common/chat-onebox.scss
index 39250f62b2..c039e7463d 100644
--- a/plugins/chat/assets/stylesheets/common/chat-onebox.scss
+++ b/plugins/chat/assets/stylesheets/common/chat-onebox.scss
@@ -18,6 +18,7 @@
       align-items: center;
       color: var(--primary-medium);
       display: flex;
+      flex-wrap: wrap;
 
       .avatar {
         aspect-ratio: 30 / 30;