diff --git a/src/messages/ImageSet.cpp b/src/messages/ImageSet.cpp
index dd4f23b9..b952e8ee 100644
--- a/src/messages/ImageSet.cpp
+++ b/src/messages/ImageSet.cpp
@@ -58,6 +58,8 @@ const ImagePtr &ImageSet::getImage3() const
 
 const ImagePtr &ImageSet::getImage(float scale) const
 {
+    scale *= getSettings()->emoteScale;
+
     int quality = 1;
 
     if (scale > 2.999)
diff --git a/src/messages/MessageElement.cpp b/src/messages/MessageElement.cpp
index a000e0a8..1fd224e6 100644
--- a/src/messages/MessageElement.cpp
+++ b/src/messages/MessageElement.cpp
@@ -117,8 +117,11 @@ void EmoteElement::addToContainer(MessageLayoutContainer &container,
             auto image = this->emote_->images.getImage(container.getScale());
             if (image->isEmpty()) return;
 
-            auto size = QSize(int(container.getScale() * image->width()),
-                              int(container.getScale() * image->height()));
+            auto emoteScale = getSettings()->emoteScale.getValue();
+
+            auto size =
+                QSize(int(container.getScale() * image->width() * emoteScale),
+                      int(container.getScale() * image->height() * emoteScale));
 
             container.addElement((new ImageLayoutElement(*this, image, size))
                                      ->setLink(this->getLink()));