diff --git a/css/converse.css b/css/converse.css
index f439caca9..e3898a9e2 100644
--- a/css/converse.css
+++ b/css/converse.css
@@ -11866,9 +11866,11 @@ body.reset {
       display: block; }
   #conversejs .message.chat-msg .chat-msg__avatar {
     margin-top: 0.5em;
-    height: 36px;
     vertical-align: middle;
-    width: 36px; }
+    height: 36px;
+    width: 36px;
+    min-height: 36px;
+    min-width: 36px; }
   #conversejs .message.chat-msg .chat-msg__heading {
     width: 100%;
     margin-top: 0.5em;
diff --git a/sass/_messages.scss b/sass/_messages.scss
index f00446691..3a6d1c276 100644
--- a/sass/_messages.scss
+++ b/sass/_messages.scss
@@ -198,9 +198,11 @@
 
             .chat-msg__avatar {
                 margin-top: 0.5em;
-                height: 36px;
                 vertical-align: middle;
+                height: 36px;
                 width: 36px;
+                min-height: 36px;
+                min-width: 36px;
             }
 
             .chat-msg__heading {