diff --git a/_deploy b/_deploy
index 7cea6805534..d484b0f1134 160000
--- a/_deploy
+++ b/_deploy
@@ -1 +1 @@
-Subproject commit 7cea6805534fbaa59929a572616663b4b85212a5
+Subproject commit d484b0f11349642ec923f077cb03012372354321
diff --git a/source/_includes/site/head.html b/source/_includes/site/head.html
index de9daf226ed..4f550a4c871 100644
--- a/source/_includes/site/head.html
+++ b/source/_includes/site/head.html
@@ -1,5 +1,6 @@
-{% if page.description %}{% capture fb_description %}{{ page.description }}{% endcapture %}{% else %}{% capture fb_description %}{{ content | raw_content }}{% endcapture %}{% endif %}
+{% capture fb_description %}{% if page.description %}{{ page.description }}{% else %}{{ content | raw_content }}{% endif %}{% endcapture %}
 {% capture description %}{% if page.description %}{{ page.description }}{% elsif site.description %}{{ site.description }}{% else %}{{ content | raw_content }}{% endif %}{% endcapture %}
+{% capture social_image %}{% if page.og_image %}{{ page.og_image | prepend: site.url }}{% else %}https://home-assistant.io/images/home-assistant-logo-2164x2164.png{% endif %}{% endcapture %}
 <!doctype html>
   <!--[if lt IE 7]>      <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
   <!--[if IE 7]>         <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
@@ -22,13 +23,13 @@
     <meta property="og:url" content="{{ page.url | canonical_url }}">
     <meta property="og:type" content="{% if page.categories %}article{% else %}website{% endif %}">
     <meta property="og:description" content="{{ fb_description | strip_html | condense_spaces | truncate:200 }}">
-    <meta property="og:image" content="{% if page.og_image %}{{ page.og_image | prepend: site.url }}{% else %}https://home-assistant.io/images/home-assistant-logo-2164x2164.png{% endif %}">
+    <meta property="og:image" content="{{ social_image }}">
 
-    <meta name="twitter:card" content="summary_large_image">
+    <meta name="twitter:card" content="{% if page.og_image %}summary_large_image{% else %}summary{% endif %}">
     <meta name="twitter:site" content="@{{ site.social.twitter.account }}">
     <meta name="twitter:title" content="{% if post.title %}{{ post.title }}{% elsif page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}">
     <meta name="twitter:description" content="{{ fb_description | strip_html | condense_spaces | truncate:200 }}">
-    <meta name="twitter:image" content="{% if page.og_image %}{{ page.og_image | prepend: site.url }}{% else %}https://home-assistant.io/images/home-assistant-logo-2164x2164.png{% endif %}">
+    <meta name="twitter:image" content="{{ social_image }}">
 
     <link href="{{ root_url }}/stylesheets/screen.css" media="screen, projection" rel="stylesheet">
     <link href="{{ root_url }}{{ site.subscribe_rss }}" rel="alternate" title="{{ site.title }}" type="application/atom+xml">
