diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 2254e5789..3c3c5361a 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -64,3 +64,4 @@
 - [Santiago González](https://github.com/netrules)
 - [Codruț Constantin Gușoi](https://www.sdwolfz.pro)
 - [Clément Pannetier](https://clementpannetier.dev)
+- [FantasticMao](https://github.com/FantasticMao)
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 2c6f232ac..cd47ddcfa 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -6,8 +6,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
     {{ with .Site.Params.author }}<meta name="author" content="{{ . }}">{{ end }}
-    {{ with .Site.Params.description }}<meta name="description" content="{{ . }}">{{ end }}
-    {{ with .Site.Params.keywords }}<meta name="keywords" content="{{ . }}">{{ end }}
+    <meta name="description" content="{{ .Description | default (.Summary | default .Site.Params.description ) }}">
+    <meta name="keywords" content="{{ (delimit .Keywords ",") | default .Site.Params.keywords }}">
 
     {{ template "_internal/twitter_cards.html" . }}
     {{ template "_internal/opengraph.html" . }}