diff --git a/madblog/config.py b/madblog/config.py
index 83ef4a0..755e654 100644
--- a/madblog/config.py
+++ b/madblog/config.py
@@ -43,7 +43,7 @@ def init_config(content_dir='.', config_file='config.yaml'):
         config.link = cfg['link']
     if cfg.get('home_link'):
         config.home_link = cfg['home_link']
-    if cfg.get('logo'):
+    if cfg.get('logo') is not None:
         config.logo = cfg['logo']
     if cfg.get('language'):
         config.language = cfg['language']
diff --git a/madblog/templates/common-head.html b/madblog/templates/common-head.html
index 70ff268..56b3394 100644
--- a/madblog/templates/common-head.html
+++ b/madblog/templates/common-head.html
@@ -20,7 +20,7 @@
     <header>
         <div class="left">
             {% if config.logo %}
-            <a href="{{ config.home_link }}" title="Home">
+            <a href="{{ config.home_link or config.link }}" title="Home">
                 <img src="{{ config.logo }}" class="icon" alt="">
             </a>
             {% endif %}