diff --git a/CHANGELOG.md b/CHANGELOG.md
index cbdbd5dac5af..afc1ccacb400 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@
 - Fix wrong float direction for `feature_row` with `type="right"`. [#4061](https://github.com/mmistakes/minimal-mistakes/issues/4061)
 - Fix reset stylesheet overruling `$doc-font-size`. [#4983](https://github.com/mmistakes/minimal-mistakes/issues/4983)
 - Fix JavaScript null error on home and splash layouts. [#4938](https://github.com/mmistakes/minimal-mistakes/issues/4938), [#4939](https://github.com/mmistakes/minimal-mistakes/pull/4939)
+- Fix bad <figure> HTML if "alt" contains quotes.
 
 ### Documentation & Maintenance
 
diff --git a/_includes/figure b/_includes/figure
index 7c539d2d79bb..62a07b113ca7 100644
--- a/_includes/figure
+++ b/_includes/figure
@@ -1,7 +1,7 @@
 <figure class="{{ include.class }}">
   {%- if include.popup -%}<a href="{{ include.image_path | relative_url }}" class="image-popup"{% if include.caption %} title="{{ include.caption | markdownify | strip_html }}"{% endif %}>{%- endif -%}
   <img src="{{ include.image_path | relative_url }}"
-       alt="{% if include.alt %}{{ include.alt }}{% endif %}">
+       alt="{% if include.alt %}{{ include.alt | escape_once }}{% endif %}">
   {%- if include.popup -%}</a>{%- endif -%}
   {%- if include.caption -%}
     <figcaption>
diff --git a/docs/_docs/18-history.md b/docs/_docs/18-history.md
index 9e9486b8597b..0346bd32229e 100644
--- a/docs/_docs/18-history.md
+++ b/docs/_docs/18-history.md
@@ -5,7 +5,7 @@ permalink: "/docs/history/"
 excerpt: Change log of enhancements and bug fixes made to the theme.
 sidebar:
   nav: docs
-last_modified_at: '2024-09-26T13:40:04+08:00'
+last_modified_at: '2024-10-02T22:57:15+08:00'
 toc: false
 ---
 
@@ -33,6 +33,7 @@ toc: false
 - Fix wrong float direction for `feature_row` with `type="right"`. [#4061](https://github.com/mmistakes/minimal-mistakes/issues/4061)
 - Fix reset stylesheet overruling `$doc-font-size`. [#4983](https://github.com/mmistakes/minimal-mistakes/issues/4983)
 - Fix JavaScript null error on home and splash layouts. [#4938](https://github.com/mmistakes/minimal-mistakes/issues/4938), [#4939](https://github.com/mmistakes/minimal-mistakes/pull/4939)
+- Fix bad &lt;figure&gt; HTML if "alt" contains quotes.
 
 ### Documentation & Maintenance