diff --git a/src/templates/_macros/_opengraph.pug b/src/templates/_macros/_opengraph.pug
index 4d8b98a..b19d582 100644
--- a/src/templates/_macros/_opengraph.pug
+++ b/src/templates/_macros/_opengraph.pug
@@ -1,8 +1,8 @@
 //- Opengraph/Twitter cards for social media.
 
-| {% macro opengraph(title, description, image, url) %}
+| {% macro opengraph(title, description, url_image, url_page) %}
 meta(property="og:type", content="website")
-meta(property="og:url", content="{{ url }}")
+meta(property="og:url", content="{{ url_page }}")
 
 meta(property="og:title", content="{{ title }} on Blender Cloud")
 meta(name="twitter:title", content="{{ title }} on Blender Cloud")
@@ -10,6 +10,8 @@ meta(name="twitter:title", content="{{ title }} on Blender Cloud")
 meta(property="og:description", content="{{ description }}")
 meta(name="twitter:description", content="{{ description }}")
 
-meta(property="og:image", content="{{ image }}")
-meta(name="twitter:image", content="{{ image }}")
+| {% if url_image %}
+meta(property="og:image", content="{{ url_image }}")
+meta(name="twitter:image", content="{{ url_image }}")
+| {% endif %}
 | {% endmacro %}