diff --git a/layouts/partials/events/event.html b/layouts/partials/events/event.html
index a3d4dbe2c67050423092620b20f3d2a46eec67c0..6193aff2226d7df101916835bd993c4e5479dd2c 100644
--- a/layouts/partials/events/event.html
+++ b/layouts/partials/events/event.html
@@ -83,14 +83,19 @@
       {{ end }}
     </div>
     <div class="media">
+      {{ $event_image := "" }}
       {{- if .Params.image -}}
+        {{ $event_image = .Params.image }}
+        {{- else if site.Params.events.default_image -}}
+        {{ $event_image = site.Data.website.default_image }}
+      {{ end }}
+      
+      {{- if or .Params.image site.Params.events.default_image -}}
         {{- partial "commons/image.html"
               (dict
-                "image"    .Params.image
+                "image"    $event_image
                 "sizes"    site.Params.image_sizes.sections.events.item
               ) -}}
-      {{- else if site.Params.events.default_image -}}
-        {{- partial "commons/image-default.html" -}}
       {{- end -}}
     </div>
   </article>
diff --git a/layouts/partials/head/seo.html b/layouts/partials/head/seo.html
index 2afeea0df6b88ea9977d1b2d9a3fc0c47ac8b11a..704b6228502a8ef0eb9e96d1ef4db0237ed03d63 100644
--- a/layouts/partials/head/seo.html
+++ b/layouts/partials/head/seo.html
@@ -24,12 +24,11 @@
   {{- end -}}
 {{- end -}}
 {{- $seoImage := "" -}}
-{{- if os.FileExists "static/assets/images/share.png" -}}
+{{- $defaultImage := site.Data.website.default_image -}}
+{{- if $defaultImage -}}
+  
   {{- $seoImage = printf "%s/assets/images/share.png" site.BaseURL -}}
 {{- end -}}
-{{- if os.FileExists "static/assets/images/share.jpg" -}}
-  {{- $seoImage = printf "%s/assets/images/share.jpg" site.BaseURL -}}
-{{- end -}}
 {{- $ogImage := $seoImage -}}
 {{- $twitterImage := $seoImage -}}
 {{- $pagefindImage := $seoImage -}}
diff --git a/layouts/partials/posts/post.html b/layouts/partials/posts/post.html
index d0b1d717ce8229c2c068846a9204df8adf75282a..a2b4e38b8ee3f049c7d9a5216289f32ef7e88391 100644
--- a/layouts/partials/posts/post.html
+++ b/layouts/partials/posts/post.html
@@ -49,14 +49,19 @@
 
   </div>
   <div class="media">
+    {{ $post_image := "" }}
     {{- if .Params.image -}}
+      {{ $post_image = .Params.image }}
+      {{- else if site.Params.posts.default_image -}}
+      {{ $post_image = site.Data.website.default_image }}
+    {{ end }}
+    
+    {{- if or .Params.image site.Params.posts.default_image -}}
       {{- partial "commons/image.html"
             (dict
-              "image"    .Params.image
+              "image"    $post_image
               "sizes"    site.Params.image_sizes.sections.posts.item
             ) -}}
-    {{- else if site.Params.posts.default_image -}}
-      {{- partial "commons/image-default.html" -}}
     {{- end -}}
   </div>
 </article>