diff --git a/CHANGELOG.md b/CHANGELOG.md
index 70071a010..19020f54f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 - Fix a bug: events pagination is bogus in admin's monitoring when selecting non default filter
 - Fix a bug: social sharing failed for projects with an underscore in their name
 - Fix a bug: html tags of events description not stripped when sharing on social network
+- Fix a bug: event, space, training or machine main image on description page is deformed on small devices
 - Updated test data to allow passing test suite
 
 ## v2.5.14 2017 September 12
diff --git a/app/assets/stylesheets/app.components.scss b/app/assets/stylesheets/app.components.scss
index 5e272835b..6a5026ba7 100644
--- a/app/assets/stylesheets/app.components.scss
+++ b/app/assets/stylesheets/app.components.scss
@@ -157,7 +157,7 @@
     overflow: hidden;
 
     img {
-      height: 400px;
+      max-height: 400px;
     }
   }
   img {