diff --git a/src/components/common/messaging/embed/Embed.tsx b/src/components/common/messaging/embed/Embed.tsx
index 795f0c43..e980b944 100644
--- a/src/components/common/messaging/embed/Embed.tsx
+++ b/src/components/common/messaging/embed/Embed.tsx
@@ -68,7 +68,8 @@ export default function Embed({ embed }: Props) {
                         mh = embed.video?.height ?? 720;
                         break;
                     }
-                    case "Twitch": {
+                    case "Twitch":
+                    case "Lightspeed": {
                         mw = 1280;
                         mh = 720;
                         break;
diff --git a/src/components/common/messaging/embed/EmbedMedia.tsx b/src/components/common/messaging/embed/EmbedMedia.tsx
index a9cb05f8..f602318b 100644
--- a/src/components/common/messaging/embed/EmbedMedia.tsx
+++ b/src/components/common/messaging/embed/EmbedMedia.tsx
@@ -47,6 +47,17 @@ export default function EmbedMedia({ embed, width, height }: Props) {
                     style={{ height }}
                 />
             );
+        case "Lightspeed":
+            return (
+                <iframe
+                    src={`https://next.lightspeed.tv/embed/${embed.special.id}`}
+                    frameBorder="0"
+                    allowFullScreen
+                    scrolling="no"
+                    loading="lazy"
+                    style={{ height }}
+                />
+            );
         case "Spotify":
             return (
                 <iframe
@@ -83,7 +94,21 @@ export default function EmbedMedia({ embed, width, height }: Props) {
             );
         }
         default: {
-            if (embed.image) {
+            if (embed.video) {
+                const url = embed.video.url;
+                return (
+                    <video
+                        loading="lazy"
+                        className={styles.image}
+                        style={{ width, height }}
+                        src={client.proxyFile(url)}
+                        loop={embed.special?.type === "GIF"}
+                        controls={embed.special?.type !== "GIF"}
+                        autoPlay={embed.special?.type === "GIF"}
+                        muted={embed.special?.type === "GIF" ? true : undefined}
+                    />
+                );
+            } else if (embed.image) {
                 const url = embed.image.url;
                 return (
                     <img