diff --git a/plugins/chat/assets/stylesheets/common/chat-message-images.scss b/plugins/chat/assets/stylesheets/common/chat-message-images.scss
index 031f201a67f..7d5d7397bb4 100644
--- a/plugins/chat/assets/stylesheets/common/chat-message-images.scss
+++ b/plugins/chat/assets/stylesheets/common/chat-message-images.scss
@@ -10,7 +10,8 @@ $max_image_height: 150px;
   .chat-message-collapser .chat-uploads img,
   .chat-message-collapser p img,
   aside.onebox .onebox-body .aspect-image-full-size,
-  aside.onebox .onebox-body .aspect-image-full-size img {
+  aside.onebox .onebox-body .aspect-image-full-size img,
+  .chat-message-text p img:not(.emoji) {
     object-fit: contain;
     max-height: $max_image_height;
     max-width: 100%;