diff --git a/config.toml b/config.toml
index ab6cab6..4409e45 100644
--- a/config.toml
+++ b/config.toml
@@ -339,6 +339,7 @@ enable_csp = true
# This avoids a flashing text issue in Firefox.
# Please see https://welpo.github.io/tabi/blog/custom-font-subset/ to learn how to create this file.
custom_subset = true
+subset_enabled = true
[extra.analytics]
# Specify which analytics service you want to use.
diff --git a/content/blog/mastering-tabi-settings/index.md b/content/blog/mastering-tabi-settings/index.md
index b022d0a..442ee46 100644
--- a/content/blog/mastering-tabi-settings/index.md
+++ b/content/blog/mastering-tabi-settings/index.md
@@ -720,9 +720,9 @@ See the [Mermaid documentation](@/blog/shortcodes/index.md#mermaid-diagrams) for
|:----:|:-------:|:-------------:|:-----------------:|:-------------------:|
| ❌ | ❌ | ✅ | ❌ | ❌ |
-Custom fonts cause flashing text in Firefox. To amend this, tabi loads a subset of glyphs for the header. Since this (slightly) increases the initial load time, it's a good idea to try and minimise the size of this subset.
+Custom fonts cause flashing text in Firefox. To amend this, tabi loads a subset of glyphs for the header. Since this (slightly) increases the initial load time, it's a good idea to try and minimise the size of this subset, or disable it completely if you're not using a custom font in your skin.
-You can create a custom subset tailored to your site, save it as `static/custom_subset.css`, and have it load with `custom_subset = true`.
+You can create a custom subset tailored to your site, save it as `static/custom_subset.css`, and have it load with `custom_subset = true`. Disabling the subset can be done with `subset_enabled = false`.
For more information, including instructions on how to create a custom subset, see the [docs](@/blog/custom-font-subset/index.md).
diff --git a/templates/partials/header.html b/templates/partials/header.html
index e07bcd8..70ef858 100644
--- a/templates/partials/header.html
+++ b/templates/partials/header.html
@@ -36,12 +36,14 @@
{# CSS #}
{# Load subset of glyphs for header. Avoids flashing issue in Firefox #}
- {% if config.extra.custom_subset and config.extra.custom_subset == true %}
-
- {% elif lang == 'en' %}
-
- {% elif lang == 'es' %}
-
+ {% if config.extra.subset_enabled %}
+ {% if config.extra.custom_subset == true %}
+
+ {% elif lang == 'en' %}
+
+ {% elif lang == 'es' %}
+
+ {% endif %}
{% endif %}
{# Define array of CSS files to load. main.css is always loaded. #}
diff --git a/theme.toml b/theme.toml
index 46db97f..f0b8a13 100644
--- a/theme.toml
+++ b/theme.toml
@@ -296,6 +296,7 @@ enable_csp = true
# This avoids a flashing text issue in Firefox.
# Please see https://welpo.github.io/tabi/blog/custom-font-subset/ to learn how to create this file.
# custom_subset = true
+subset_enabled = true
[extra.analytics]
# Specify which analytics service you want to use.