diff --git a/source/_partials/head.twig b/source/_partials/head.twig
index c6c93ee5..9aa17455 100644
--- a/source/_partials/head.twig
+++ b/source/_partials/head.twig
@@ -9,9 +9,7 @@
         <meta name="description" content="{{ page.meta.description|e('html') }}">
     {% endif %}
 
-    {% if page.meta.og %}
-        {% include 'og' with { og: page.meta.og } %}
-    {% endif %}
+    {% include 'og' with { og: page.meta.og } %}
 
     <link rel="stylesheet" href="{{ site.url }}/assets/css/site.css">
     {% block styles %}{% endblock %}
diff --git a/source/_partials/og.twig b/source/_partials/og.twig
index 2ac27bbb..226042e6 100644
--- a/source/_partials/og.twig
+++ b/source/_partials/og.twig
@@ -1,8 +1,5 @@
 <meta property="og:url" content="{{ site.url }}{{ page.url }}">
-
-{% if og.title %}
-    <meta property="og:title" content="{{ og.title|raw }}"/>
-{% endif %}
+<meta property="og:title" content="{{ og.title ? og.title|raw : page.title|raw }}"/>
 
 {% if og.description %}
     <meta property="og:description" content="{{ og.description|raw }}"/>
@@ -23,16 +20,22 @@
     {% if og.image.height %}
         <meta property="og:image:height" content="{{ og.image.height }}"/>
     {% endif %}
+{% else %}
+    <meta property="og:image" content="{{ site.url }}{{ site.avatar.url }}"/>
+    <meta property="og:image:height" content="327"/>
+    <meta property="og:image:type" content="image/jpg">
+    <meta property="og:image:width" content="327"/>
 {% endif %}
 
 {% if og.title %}
     {% if og.image %}
         <meta name="twitter:card" content="summary_large_image"/>
         <meta name="twitter:image:src" content="{{ site.url }}{{ og.image.url }}">
-        <meta name="twitter:creator" content="@{{ site.twitter.name }}"/>
     {% else %}
         <meta name="twitter:card" content="summary"/>
+        <meta name="twitter:image:src" content="{{ site.url }}{{ site.avatar.url }}">
     {% endif %}
+    <meta name="twitter:creator" content="@{{ site.twitter.name }}"/>
     <meta name="twitter:title" content="{{ og.title|raw }}"/>
     <meta name="twitter:text:description" content="{{ og.description|raw }}"/>
     <meta name="twitter:site" content="@{{ site.twitter.name }}"/>