diff --git a/quartz/components/TagList.tsx b/quartz/components/TagList.tsx
index ba48098bd..7c0f619fa 100644
--- a/quartz/components/TagList.tsx
+++ b/quartz/components/TagList.tsx
@@ -4,25 +4,27 @@ import { classNames } from "../util/lang"
 
 const TagList: QuartzComponent = ({ fileData, displayClass }: QuartzComponentProps) => {
   const tags = fileData.frontmatter?.tags
+  const enableTags = fileData.frontmatter?.enableTags ?? true
   const baseDir = pathToRoot(fileData.slug!)
-  if (tags && tags.length > 0) {
-    return (
-      <ul class={classNames(displayClass, "tags")}>
-        {tags.map((tag) => {
-          const linkDest = baseDir + `/tags/${slugTag(tag)}`
-          return (
-            <li>
-              <a href={linkDest} class="internal tag-link">
-                {tag}
-              </a>
-            </li>
-          )
-        })}
-      </ul>
-    )
-  } else {
+
+  if (enableTags === false || !tags || tags.length === 0) {
     return null
   }
+
+  return (
+    <ul class={classNames(displayClass, "tags")}>
+      {tags.map((tag) => {
+        const linkDest = baseDir + `/tags/${slugTag(tag)}`
+        return (
+          <li key={tag}>
+            <a href={linkDest} class="internal tag-link">
+              {tag}
+            </a>
+          </li>
+        )
+      })}
+    </ul>
+  )
 }
 
 TagList.css = `