diff --git a/templates/macros.html b/templates/macros.html
index b271dbc..86ab98d 100644
--- a/templates/macros.html
+++ b/templates/macros.html
@@ -15,7 +15,7 @@
 {% endmacro podlove_subscribe_button %}
 {% macro title(page) -%}
 {#- tera lacks zero padding and also log operator -#}
-{%- if page.extra.episode -%}
+{%- if page.extra.episode is defined -%}
 {%- set len = page.extra.episode | as_str | length -%}
 {{ config.extra.acronym }}{% for i in range(end=config.extra.pad_to - len) %}0{% endfor %}{{ page.extra.episode }} {% endif -%}
 {{ page.title }}
diff --git a/templates/page.html b/templates/page.html
index 3bf0440..87a3d7b 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
 {% block metadata -%}
-{%- if page.extra.episode -%}
+{%- if page.extra.episode is defined -%}
 {{ super() }}
 <meta name="twitter:card" content="summary">
 <meta name="twitter:title" content="{{ page.title }}">
@@ -27,7 +27,7 @@
 
 {% block scripts -%}
 {{ super() }}
-{%- if page.extra.episode %}
+{%- if page.extra.episode is defined %}
 {% include "podlove-player-script.html" %}
 {%- endif %}
 {%- endblock scripts %}
diff --git a/templates/podlove-player.html b/templates/podlove-player.html
index 24a304a..0d53233 100644
--- a/templates/podlove-player.html
+++ b/templates/podlove-player.html
@@ -1,4 +1,4 @@
-{%- if page.extra.episode %}
+{%- if page.extra.episode is defined %}
 {%- set episodes = load_data(path="static/episodes.json") -%}
 <div class="podlove-player" id="podlove-player-{{ page.slug }}" data-id="{{ page.slug }}">
   <audio controls preload="none">