diff --git a/templates/changelog/macros.twig b/templates/changelog/macros.twig
index 54c9a30..278253b 100644
--- a/templates/changelog/macros.twig
+++ b/templates/changelog/macros.twig
@@ -25,7 +25,7 @@
 {% endmacro %}
 
 {% macro changelog_entry(change, is_small, is_manage) %}
-    {% set user = change.user %}
+    {% set user = change.user|default(null) %}
     {% if change.change is defined %}
         {% set change = change.change %}
     {% endif %}