diff --git a/_includes/header.html b/_includes/header.html
index b4b5df7..7a09ce6 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -3,7 +3,10 @@
 
 {%- assign light_logo = site.logo.light | file_exists -%}
 {%- assign dark_logo  = site.logo.dark  | file_exists -%}
+{%- assign single_logo = nil -%}
+{%- if site.logo and site.logo.light == nil and site.logo.dark == nil -%}
 {%- assign single_logo = site.logo | file_exists -%}
+{%- endif -%}
 {%- assign fallback_svg = "images/logo.svg" | file_exists -%}
 {%- assign fallback_png = "images/logo.png" | file_exists -%}
 {%- assign fallback_jpg = "images/logo.jpg" | file_exists -%}
diff --git a/_includes/meta.html b/_includes/meta.html
index dbc4dad..42b2c57 100644
--- a/_includes/meta.html
+++ b/_includes/meta.html
@@ -38,12 +38,18 @@
 {%- endcomment -%}
 {%- assign icon_light = site.icon.light | file_exists -%}
 {%- assign icon_dark  = site.icon.dark  | file_exists -%}
+{%- assign icon_single = nil -%}
+{%- if site.icon and site.icon.light == nil and site.icon.dark == nil -%}
 {%- assign icon_single = site.icon | file_exists -%}
+{%- endif -%}
 {%- assign png_fallback = "images/icon.png" | file_exists -%}
 {%- assign jpg_fallback = "images/icon.jpg" | file_exists -%}
 {%- assign logo_light = site.logo.light | file_exists -%}
 {%- assign logo_dark  = site.logo.dark  | file_exists -%}
+{%- assign logo_single = nil -%}
+{%- if site.logo and site.logo.light == nil and site.logo.dark == nil -%}
 {%- assign logo_single = site.logo | file_exists -%}
+{%- endif -%}
 
 {%- assign icon_default = icon_single | default: png_fallback | default: jpg_fallback | default: logo_single | default: logo_light | default: logo_dark -%}