Merge commit 'fa50e4bf4' into anoa/dinsic_release_1_31_0

1 files changed, 6 insertions, 5 deletions

diff --git a/synapse/config/_base.py b/synapse/config/_base.py

index f2ddb039a3..93344583e7 100644
--- a/synapse/config/_base.py
+++ b/synapse/config/_base.py
@@ -253,11 +253,12 @@ class Config:
         env = jinja2.Environment(loader=loader, autoescape=autoescape)
 
         # Update the environment with our custom filters
-        env.filters.update({"format_ts": _format_ts_filter})
-        if self.public_baseurl:
-            env.filters.update(
-                {"mxc_to_http": _create_mxc_to_http_filter(self.public_baseurl)}
-            )
+        env.filters.update(
+            {
+                "format_ts": _format_ts_filter,
+                "mxc_to_http": _create_mxc_to_http_filter(self.public_baseurl),
+            }
+        )
 
         for filename in filenames:
             # Load the template