diff --git a/recette/models.py b/recette/models.py
index 0b4c82b..962fdeb 100644
--- a/recette/models.py
+++ b/recette/models.py
@@ -53,7 +53,15 @@ class Composition(models.Model):
     unite = models.ForeignKey(Unite, null=True, blank=True, on_delete=models.PROTECT)
 
     def __str__(self):
-        return "%s %s %s" % (self.quantite, self.unite.nom, self.ingredient.nom)
+        return "%s %s %s" % (
+            self.quantite_formatted or '', self.unite.nom if self.unite else '', self.ingredient.nom
+        )
+
+    @property
+    def quantite_formatted(self):
+        if self.quantite is None:
+            return ''
+        return str(self.quantite).rstrip('0').rstrip('.')
 
 
 @receiver(models.signals.post_delete, sender=Recette)
diff --git a/templates/recette.html b/templates/recette.html
index f634389..7b1b07f 100644
--- a/templates/recette.html
+++ b/templates/recette.html
@@ -9,7 +9,7 @@
 <div class="ingredients">
 <h2>Ingrédients</h2>
 <ul>
-    {% for comp in recette.ingredients.all %}
+    {% for comp in recette.composition_set.all %}
     <li>{{ comp }}</li>
     {% endfor %}
 </ul>