diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac014cf08..f1e4038eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -106,10 +106,15 @@ Version 1.5.15
 - [phonenumber validation] allow to validate against mobile **or** landline/voip phonenumbers;
 - [phonenumber validation & format] format and validation does not make the app fail when network is not available;
 
+Version 1.5.16
+==============
+
+- [translation] in french, replace "Modifier" by "Enregistrer" in the edit form
+- [entity render] do not throw an exception when null element are passed to `chill_entity_render_box` and `chill_entity_render_string`
+
 Master branch
 =============
 
-- [translation] in french, replace "Modifier" by "Enregistrer" in the edit form
 - [chill entity render] fix error when fallback to default entity render (usage of `__toString()`)
 - [CRUD] add step delete
 - [CRUD] check that action exists before inserting them in edit and view template
diff --git a/Templating/Entity/ChillEntityRenderExtension.php b/Templating/Entity/ChillEntityRenderExtension.php
index 23a90240f..e3f14d270 100644
--- a/Templating/Entity/ChillEntityRenderExtension.php
+++ b/Templating/Entity/ChillEntityRenderExtension.php
@@ -83,7 +83,7 @@ class ChillEntityRenderExtension extends AbstractExtension
         $this->renders[] = $render;
     }
     
-    protected function getRender($entity, $options): ChillEntityRenderInterface
+    protected function getRender($entity, $options): ?ChillEntityRenderInterface
     {
         foreach ($this->renders as $render) {
             if ($render->supports($entity, $options)) {