diff --git a/CHANGELOG.md b/CHANGELOG.md
index e0e9305a..8b1cff82 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -55,6 +55,7 @@ _This release is scheduled to be released on 2023-04-01._
 - Fix wrong vertical alignment of calendar title column when wrapEvents is true (#3053)
 - Fix empty news feed stopping the reload forever
 - Fix e2e tests (failed after async changes) by running calendar and newsfeed tests last
+- Fix default alert module to render HTML for title and message
 
 ## [2.22.0] - 2023-01-01
 
diff --git a/modules/default/alert/templates/alert.njk b/modules/default/alert/templates/alert.njk
index 0a49df8a..7349a7ae 100644
--- a/modules/default/alert/templates/alert.njk
+++ b/modules/default/alert/templates/alert.njk
@@ -8,11 +8,11 @@
   <br/>
 {% endif %}
 {% if title %}
-  <span class="thin dimmed medium">{{ title }}</span>
+  <span class="thin dimmed medium">{{ title if titleType == 'text' else title | safe }}</span>
 {% endif %}
 {% if message %}
   {% if title %}
     <br/>
   {% endif %}
-  <span class="light bright small">{{ message | safe }}</span>
+  <span class="light bright small">{{ message if messageType == 'text' else message | safe }}</span>
 {% endif %}
diff --git a/modules/default/alert/templates/notification.njk b/modules/default/alert/templates/notification.njk
index af3adf26..1594ad48 100644
--- a/modules/default/alert/templates/notification.njk
+++ b/modules/default/alert/templates/notification.njk
@@ -1,9 +1,9 @@
 {% if title %}
-  <span class="thin dimmed medium">{{ title }}</span>
+  <span class="thin dimmed medium">{{ title if titleType == 'text' else title | safe }}</span>
 {% endif %}
 {% if message %}
   {% if title %}
     <br/>
   {% endif %}
-  <span class="light bright small">{{ message | safe }}</span>
+  <span class="light bright small">{{ message if messageType == 'text' else message | safe }}</span>
 {% endif %}