diff --git a/templates/macros/format_date.html b/templates/macros/format_date.html
index 8bb8e25..067a941 100644
--- a/templates/macros/format_date.html
+++ b/templates/macros/format_date.html
@@ -33,7 +33,11 @@
         {{ date | date(format="%B %Y") }}
     {% endif %}
 {% else %}
-    {{ date | date(format="%d %b %Y", locale=date_locale) }}
+    {% if short %}
+        {{ date | date(format="%-d %b %Y", locale=date_locale) }}
+    {% else %}
+        {{ date | date(format="%d %b %Y", locale=date_locale) }}
+    {% endif %}
 {% endif %}
 
 {% endmacro %}