diff --git a/packages/app/src/Const.ts b/packages/app/src/Const.ts
index 6228798d..1dd55da5 100644
--- a/packages/app/src/Const.ts
+++ b/packages/app/src/Const.ts
@@ -177,4 +177,5 @@ export const MagnetRegex = /(magnet:[\S]+)/i;
 /**
  * Wavlake embed regex
  */
-export const WavlakeRegex = /(?:player\.)?wavlake\.com\/(track\/[.a-zA-Z0-9-]+|album\/[.a-zA-Z0-9-]+|[.a-zA-Z0-9-]+)/i;
+export const WavlakeRegex =
+  /(?!zine\.wavlake\.com)(?:player\.|www\.)?wavlake\.com\/(?:(?:track|album)\/[a-f0-9]{8}(?:-[a-f0-9]{4}){3}-[a-f0-9]{12}|[a-z-]+)$/i;
diff --git a/packages/app/src/Element/WavlakeEmbed.tsx b/packages/app/src/Element/WavlakeEmbed.tsx
index da2168f0..aa14a7b4 100644
--- a/packages/app/src/Element/WavlakeEmbed.tsx
+++ b/packages/app/src/Element/WavlakeEmbed.tsx
@@ -1,5 +1,5 @@
 const WavlakeEmbed = ({ link }: { link: string }) => {
-  const convertedUrl = link.replace(/(?:player\.)?wavlake\.com/, "embed.wavlake.com");
+  const convertedUrl = link.replace(/(?:player\.|www\.)?wavlake\.com/, "embed.wavlake.com");
 
   return (
     <iframe