diff --git a/quartz.config.ts b/quartz.config.ts
index b85e51b74..52ae335f2 100644
--- a/quartz.config.ts
+++ b/quartz.config.ts
@@ -75,8 +75,7 @@ const config: QuartzConfig = {
         algorithm: "aes-256-cbc",
         keyLength: 32,
         iterations: 100000,
-        encryptedFolders: {
-        },
+        encryptedFolders: {},
         ttl: 3600 * 24 * 7, // A week
       }),
       Plugin.Description(),
diff --git a/quartz/plugins/transformers/encrypt.ts b/quartz/plugins/transformers/encrypt.ts
index 2b06881b0..64ba7aa38 100644
--- a/quartz/plugins/transformers/encrypt.ts
+++ b/quartz/plugins/transformers/encrypt.ts
@@ -123,7 +123,11 @@ export const EncryptPlugin: QuartzTransformerPlugin<Partial<Options>> = (userOpt
     }
 
     if (deepestFolder) {
-      return String(opts.encryptedFolders[deepestFolder])
+      if (frontmatter?.password) { // if frontmatter has a password, use it
+        return frontmatter.password as string;
+      }
+
+      return opts.encryptedFolders[deepestFolder] as string;
     }
   }