diff --git a/client/src/core/client/admin/components/MediaContainer/BlueskyMedia.tsx b/client/src/core/client/admin/components/MediaContainer/BlueskyMedia.tsx
new file mode 100644
index 0000000000..18e2fdea07
--- /dev/null
+++ b/client/src/core/client/admin/components/MediaContainer/BlueskyMedia.tsx
@@ -0,0 +1,27 @@
+import React, { FunctionComponent } from "react";
+
+import Frame from "coral-framework/components/Frame";
+
+import styles from "./Media.css";
+
+interface Props {
+  id: string;
+  url: string;
+  siteID: string;
+}
+
+const BlueskyMedia: FunctionComponent<Props> = ({ id, url, siteID }) => {
+  const component = encodeURIComponent(url);
+  return (
+    <div className={styles.embed}>
+      <Frame
+        id={id}
+        src={`/api/oembed?type=bluesky&url=${component}&siteID=${siteID}`}
+        width="100%"
+        showFullHeight
+      />
+    </div>
+  );
+};
+
+export default BlueskyMedia;
diff --git a/client/src/core/client/admin/components/MediaContainer/MediaContainer.tsx b/client/src/core/client/admin/components/MediaContainer/MediaContainer.tsx
index 24a8c10bf0..6d6ffe151f 100644
--- a/client/src/core/client/admin/components/MediaContainer/MediaContainer.tsx
+++ b/client/src/core/client/admin/components/MediaContainer/MediaContainer.tsx
@@ -2,6 +2,7 @@ import React, { FunctionComponent } from "react";
 import { graphql } from "react-relay";
 
 import { withFragmentContainer } from "coral-framework/lib/relay";
+import BlueskyMedia from "coral-stream/common/Media/BlueskyMedia";
 
 import { MediaContainer_comment } from "coral-admin/__generated__/MediaContainer_comment.graphql";
 
@@ -48,6 +49,14 @@ const MediaContainer: FunctionComponent<Props> = ({ comment }) => {
           siteID={comment.site.id}
         />
       );
+    case "BlueskyMedia":
+      return (
+        <BlueskyMedia
+          id={comment.id}
+          url={media.url}
+          siteID={comment.site.id}
+        />
+      );
     case "YouTubeMedia":
       return (
         <YouTubeMedia
@@ -103,6 +112,9 @@ const enhanced = withFragmentContainer<Props>({
           ... on TwitterMedia {
             url
           }
+          ... on BlueskyMedia {
+            url
+          }
           ... on YouTubeMedia {
             url
             still
diff --git a/client/src/core/client/admin/components/MediaContainer/index.ts b/client/src/core/client/admin/components/MediaContainer/index.ts
index 8ff24d19c8..01083a6390 100644
--- a/client/src/core/client/admin/components/MediaContainer/index.ts
+++ b/client/src/core/client/admin/components/MediaContainer/index.ts
@@ -1,4 +1,5 @@
 export { default as MediaContainer } from "./MediaContainer";
 export { default as GifMedia } from "./GifMedia";
 export { default as TwitterMedia } from "./TwitterMedia";
+export { default as BlueskyMedia } from "./BlueskyMedia";
 export { default as YouTubeMedia } from "./YouTubeMedia";
diff --git a/client/src/core/client/admin/routes/Configure/sections/General/MediaLinksConfig.tsx b/client/src/core/client/admin/routes/Configure/sections/General/MediaLinksConfig.tsx
index 51b7738d1e..8f283303a3 100644
--- a/client/src/core/client/admin/routes/Configure/sections/General/MediaLinksConfig.tsx
+++ b/client/src/core/client/admin/routes/Configure/sections/General/MediaLinksConfig.tsx
@@ -41,6 +41,9 @@ graphql`
       twitter {
         enabled
       }
+      bluesky {
+        enabled
+      }
       youtube {
         enabled
       }
@@ -90,6 +93,26 @@ const MediaLinksConfig: FunctionComponent<Props> = ({ disabled }) => {
         />
       </FormField>
 
+      <FormField>
+        <Localized id="configure-general-embedLinks-enableBlueskyEmbeds">
+          <Label component="legend">Allow Bluesky post embeds</Label>
+        </Localized>
+        <OnOffField
+          name="media.bluesky.enabled"
+          disabled={disabled}
+          onLabel={
+            <Localized id="configure-general-embedLinks-On">
+              <span>Yes</span>
+            </Localized>
+          }
+          offLabel={
+            <Localized id="configure-general-embedLinks-Off">
+              <span>No</span>
+            </Localized>
+          }
+        />
+      </FormField>
+
       <FormField>
         <Localized id="configure-general-embedLinks-enableYouTubeEmbeds">
           <Label component="legend">Allow YouTube embeds</Label>
diff --git a/client/src/core/client/admin/test/fixtures.ts b/client/src/core/client/admin/test/fixtures.ts
index 771fb3c95b..c0eed5f45b 100644
--- a/client/src/core/client/admin/test/fixtures.ts
+++ b/client/src/core/client/admin/test/fixtures.ts
@@ -209,6 +209,7 @@ export const settings = createFixture<GQLSettings>({
   premoderateSuspectWords: false,
   media: {
     twitter: { enabled: false },
+    bluesky: { enabled: false },
     gifs: { enabled: false },
     youtube: { enabled: false },
     external: { enabled: false },
diff --git a/client/src/core/client/framework/components/Frame.tsx b/client/src/core/client/framework/components/Frame.tsx
index f24a4603c8..28587e2e3d 100644
--- a/client/src/core/client/framework/components/Frame.tsx
+++ b/client/src/core/client/framework/components/Frame.tsx
@@ -22,7 +22,7 @@ interface Props {
   isToggled?: boolean;
   width?: string;
   showFullHeight?: boolean;
-  type?: "twitter" | "youtube" | "external_media";
+  type?: "twitter" | "bluesky" | "youtube" | "external_media";
   mobile?: boolean;
 }
 
diff --git a/client/src/core/client/stream/common/Media/BlueskyMedia.tsx b/client/src/core/client/stream/common/Media/BlueskyMedia.tsx
new file mode 100644
index 0000000000..79fdacde9c
--- /dev/null
+++ b/client/src/core/client/stream/common/Media/BlueskyMedia.tsx
@@ -0,0 +1,30 @@
+import React, { FunctionComponent } from "react";
+
+import Frame from "coral-framework/components/Frame";
+
+interface Props {
+  id?: string;
+  url: string;
+  siteID: string;
+  isToggled?: boolean;
+}
+
+const BlueskyMedia: FunctionComponent<Props> = ({
+  id,
+  url,
+  siteID,
+  isToggled,
+}) => {
+  const component = encodeURIComponent(url);
+  return (
+    <Frame
+      id={id}
+      width="100%"
+      src={`/api/oembed?type=bluesky&url=${component}&siteID=${siteID}`}
+      isToggled={isToggled}
+      type="bluesky"
+    />
+  );
+};
+
+export default BlueskyMedia;
diff --git a/client/src/core/client/stream/tabs/Comments/Comment/EditCommentForm/EditCommentFormContainer.tsx b/client/src/core/client/stream/tabs/Comments/Comment/EditCommentForm/EditCommentFormContainer.tsx
index fd46afe8c4..63f9a44531 100644
--- a/client/src/core/client/stream/tabs/Comments/Comment/EditCommentForm/EditCommentFormContainer.tsx
+++ b/client/src/core/client/stream/tabs/Comments/Comment/EditCommentForm/EditCommentFormContainer.tsx
@@ -60,6 +60,11 @@ function getMediaFromComment(comment: CommentData) {
         type: "twitter",
         url: comment.revision.media.url,
       };
+    case "BlueskyMedia":
+      return {
+        type: "bluesky",
+        url: comment.revision.media.url,
+      };
     case "ExternalMedia":
       return {
         type: "external",
@@ -211,6 +216,10 @@ const enhanced = withEditCommentMutation(
               url
               width
             }
+            ... on BlueskyMedia {
+              url
+              width
+            }
             ... on YouTubeMedia {
               url
               width
@@ -248,6 +257,9 @@ const enhanced = withEditCommentMutation(
           twitter {
             enabled
           }
+          bluesky {
+            enabled
+          }
           youtube {
             enabled
           }
diff --git a/client/src/core/client/stream/tabs/Comments/Comment/EditCommentForm/EditCommentMutation.ts b/client/src/core/client/stream/tabs/Comments/Comment/EditCommentForm/EditCommentMutation.ts
index 35fd1cc387..eba246f43a 100644
--- a/client/src/core/client/stream/tabs/Comments/Comment/EditCommentForm/EditCommentMutation.ts
+++ b/client/src/core/client/stream/tabs/Comments/Comment/EditCommentForm/EditCommentMutation.ts
@@ -43,6 +43,10 @@ const mutation = graphql`
               url
               width
             }
+            ... on BlueskyMedia {
+              url
+              width
+            }
             ... on YouTubeMedia {
               url
               width
diff --git a/client/src/core/client/stream/tabs/Comments/Comment/MediaConfirmation/MediaConfirmPrompt.tsx b/client/src/core/client/stream/tabs/Comments/Comment/MediaConfirmation/MediaConfirmPrompt.tsx
index e05c1df6a7..03c71b93b9 100644
--- a/client/src/core/client/stream/tabs/Comments/Comment/MediaConfirmation/MediaConfirmPrompt.tsx
+++ b/client/src/core/client/stream/tabs/Comments/Comment/MediaConfirmation/MediaConfirmPrompt.tsx
@@ -51,6 +51,13 @@ const MediaConfirmPrompt: FunctionComponent<Props> = ({
                 </p>
               </Localized>
             )}
+            {media.type === "bluesky" && (
+              <Localized id="comments-postComment-confirmMedia-bluesky">
+                <p className={styles.prompt}>
+                  Add this post to the end of your comment?
+                </p>
+              </Localized>
+            )}
             <p className={styles.url}>{media.url}</p>
           </div>
         </div>
@@ -76,6 +83,17 @@ const MediaConfirmPrompt: FunctionComponent<Props> = ({
               </Button>
             </Localized>
           )}
+          {media.type === "bluesky" && (
+            <Localized id="comments-postComment-confirmMedia-add-bluesky">
+              <Button
+                color="mono"
+                onClick={onConfirm}
+                className={styles.promptButton}
+              >
+                Add post
+              </Button>
+            </Localized>
+          )}
           {media.type === "youtube" && (
             <Localized id="comments-postComment-confirmMedia-add-video">
               <Button
diff --git a/client/src/core/client/stream/tabs/Comments/Comment/MediaConfirmation/MediaConfirmationIcon.tsx b/client/src/core/client/stream/tabs/Comments/Comment/MediaConfirmation/MediaConfirmationIcon.tsx
index b2769f66e6..b855094f95 100644
--- a/client/src/core/client/stream/tabs/Comments/Comment/MediaConfirmation/MediaConfirmationIcon.tsx
+++ b/client/src/core/client/stream/tabs/Comments/Comment/MediaConfirmation/MediaConfirmationIcon.tsx
@@ -2,6 +2,7 @@ import React, { FunctionComponent } from "react";
 
 import { MediaLink } from "coral-common/common/lib/helpers/findMediaLinks";
 import {
+  BlueskyLogoIcon,
   ImageFileLandscapeIcon,
   SvgIcon,
   VideoPlayerIcon,
@@ -20,6 +21,9 @@ const MediaConfirmationIcon: FunctionComponent<Props> = ({ media }) => {
       {media.type === "twitter" && (
         <SvgIcon size="xs" filled="currentColor" Icon={XLogoTwitterIcon} />
       )}
+      {media.type === "bluesky" && (
+        <SvgIcon filled="currentColor" Icon={BlueskyLogoIcon} />
+      )}
     </>
   );
 };
diff --git a/client/src/core/client/stream/tabs/Comments/Comment/MediaConfirmation/MediaPreview.tsx b/client/src/core/client/stream/tabs/Comments/Comment/MediaConfirmation/MediaPreview.tsx
index 3a5368f35a..0241f6a454 100644
--- a/client/src/core/client/stream/tabs/Comments/Comment/MediaConfirmation/MediaPreview.tsx
+++ b/client/src/core/client/stream/tabs/Comments/Comment/MediaConfirmation/MediaPreview.tsx
@@ -7,6 +7,7 @@ import {
   TwitterMedia,
   YouTubeMedia,
 } from "coral-stream/common/Media";
+import BlueskyMedia from "coral-stream/common/Media/BlueskyMedia";
 import { RemoveIcon, SvgIcon } from "coral-ui/components/icons";
 import { Flex, HorizontalGutter, MatchMedia } from "coral-ui/components/v2";
 import { Button } from "coral-ui/components/v3";
@@ -62,13 +63,18 @@ const MediaPreview: FunctionComponent<Props> = ({
             </Flex>
 
             {/* Show the actual media. */}
-            {media.type === "external" ? (
+            {media.type === "external" && (
               <ExternalMedia url={media.url} siteID={siteID} />
-            ) : media.type === "twitter" ? (
+            )}
+            {media.type === "twitter" && (
               <TwitterMedia url={media.url} siteID={siteID} />
-            ) : media.type === "youtube" ? (
+            )}
+            {media.type === "bluesky" && (
+              <BlueskyMedia url={media.url} siteID={siteID} />
+            )}
+            {media.type === "youtube" && (
               <YouTubeMedia url={media.url} siteID={siteID} isToggled={true} />
-            ) : null}
+            )}
           </HorizontalGutter>
 
           {/* On extra small screens, move the remove button to the bottom! */}
diff --git a/client/src/core/client/stream/tabs/Comments/Comment/MediaSection/MediaSectionContainer.tsx b/client/src/core/client/stream/tabs/Comments/Comment/MediaSection/MediaSectionContainer.tsx
index 3d82675c24..28adbb7bf3 100644
--- a/client/src/core/client/stream/tabs/Comments/Comment/MediaSection/MediaSectionContainer.tsx
+++ b/client/src/core/client/stream/tabs/Comments/Comment/MediaSection/MediaSectionContainer.tsx
@@ -26,6 +26,7 @@ import { MediaSectionContainer_comment } from "coral-stream/__generated__/MediaS
 import { MediaSectionContainer_settings } from "coral-stream/__generated__/MediaSectionContainer_settings.graphql";
 import { MediaSectionContainerLocal } from "coral-stream/__generated__/MediaSectionContainerLocal.graphql";
 
+import BlueskyMedia from "coral-stream/common/Media/BlueskyMedia";
 import styles from "./MediaSectionContainer.css";
 
 interface Props {
@@ -84,7 +85,9 @@ const MediaSectionContainer: FunctionComponent<Props> = ({
     (media.__typename === "TwitterMedia" && !settings.media.twitter.enabled) ||
     (media.__typename === "YouTubeMedia" && !settings.media.youtube.enabled) ||
     (media.__typename === "GiphyMedia" && !settings.media.gifs.enabled) ||
-    (media.__typename === "ExternalMedia" && !settings.media.external.enabled)
+    (media.__typename === "ExternalMedia" &&
+      !settings.media.external.enabled) ||
+    (media.__typename === "BlueskyMedia" && !settings.media.bluesky.enabled)
   ) {
     return null;
   }
@@ -103,6 +106,9 @@ const MediaSectionContainer: FunctionComponent<Props> = ({
         {media.__typename === "TwitterMedia" && (
           <Localized id="comments-embedLinks-show-twitter">Show post</Localized>
         )}
+        {media.__typename === "BlueskyMedia" && (
+          <Localized id="comments-embedLinks-show-bluesky">Show post</Localized>
+        )}
         {media.__typename === "YouTubeMedia" && (
           <Localized id="comments-embedLinks-show-youtube">
             Show video
@@ -144,6 +150,11 @@ const MediaSectionContainer: FunctionComponent<Props> = ({
               Hide post
             </Localized>
           )}
+          {media.__typename === "BlueskyMedia" && (
+            <Localized id="comments-embedLinks-hide-bluesky">
+              Hide post
+            </Localized>
+          )}
           {media.__typename === "GiphyMedia" && (
             <Localized id="comments-embedLinks-hide-gif">Hide GIF</Localized>
           )}
@@ -178,6 +189,14 @@ const MediaSectionContainer: FunctionComponent<Props> = ({
           isToggled={isToggled}
         />
       )}
+      {media.__typename === "BlueskyMedia" && (
+        <BlueskyMedia
+          id={comment.id}
+          url={media.url}
+          siteID={comment.site.id}
+          isToggled={isToggled}
+        />
+      )}
       {media.__typename === "YouTubeMedia" && (
         <YouTubeMedia
           id={comment.id}
@@ -224,6 +243,10 @@ const enhanced = withFragmentContainer<Props>({
             url
             width
           }
+          ... on BlueskyMedia {
+            url
+            width
+          }
           ... on YouTubeMedia {
             url
             width
@@ -242,6 +265,9 @@ const enhanced = withFragmentContainer<Props>({
         twitter {
           enabled
         }
+        bluesky {
+          enabled
+        }
         youtube {
           enabled
         }
diff --git a/client/src/core/client/stream/tabs/Comments/Comment/ModerationDropdown/CopyCommentEmbedCodeContainer.tsx b/client/src/core/client/stream/tabs/Comments/Comment/ModerationDropdown/CopyCommentEmbedCodeContainer.tsx
index d4090a95ae..f2a163071b 100644
--- a/client/src/core/client/stream/tabs/Comments/Comment/ModerationDropdown/CopyCommentEmbedCodeContainer.tsx
+++ b/client/src/core/client/stream/tabs/Comments/Comment/ModerationDropdown/CopyCommentEmbedCodeContainer.tsx
@@ -97,7 +97,7 @@ const CopyCommentEmbedCodeContainer: FunctionComponent<Props> = ({
         break;
       // Twitter and YouTube media embeds already have links in comments
       // so they don't also need to be added to the simple comment fallback
-      case "%other" || "TwitterMedia" || "YouTubeMedia":
+      case "%other" || "TwitterMedia" || "BlueskyMedia" || "YouTubeMedia":
         break;
     }
   }
@@ -163,6 +163,9 @@ const enhanced = withFragmentContainer<Props>({
           ... on TwitterMedia {
             url
           }
+          ... on BlueskyMedia {
+            url
+          }
           ... on YouTubeMedia {
             url
           }
diff --git a/client/src/core/client/stream/tabs/Comments/Comment/ReplyCommentForm/ReplyCommentFormContainer.tsx b/client/src/core/client/stream/tabs/Comments/Comment/ReplyCommentForm/ReplyCommentFormContainer.tsx
index 4d027c7e09..e34099e6fc 100644
--- a/client/src/core/client/stream/tabs/Comments/Comment/ReplyCommentForm/ReplyCommentFormContainer.tsx
+++ b/client/src/core/client/stream/tabs/Comments/Comment/ReplyCommentForm/ReplyCommentFormContainer.tsx
@@ -353,6 +353,9 @@ const enhanced = withCreateCommentReplyMutation(
           twitter {
             enabled
           }
+          bluesky {
+            enabled
+          }
           youtube {
             enabled
           }
diff --git a/client/src/core/client/stream/tabs/Comments/Stream/CommentForm/CommentForm.tsx b/client/src/core/client/stream/tabs/Comments/Stream/CommentForm/CommentForm.tsx
index 909c3eda43..5c5e4a6b5d 100644
--- a/client/src/core/client/stream/tabs/Comments/Stream/CommentForm/CommentForm.tsx
+++ b/client/src/core/client/stream/tabs/Comments/Stream/CommentForm/CommentForm.tsx
@@ -73,6 +73,9 @@ interface MediaConfig {
   twitter: {
     enabled: boolean;
   };
+  bluesky: {
+    enabled: boolean;
+  };
   youtube: {
     enabled: boolean;
   };
@@ -199,7 +202,9 @@ const CommentForm: FunctionComponent<Props> = ({
         // if there is a pending or selected twitter or youtube url
         if (
           existingLink &&
-          (existingLink.type === "twitter" || existingLink.type === "youtube")
+          (existingLink.type === "twitter" ||
+            existingLink.type === "youtube" ||
+            existingLink.type === "bluesky")
         ) {
           const links = findMediaLinks(html);
           // ensure the text still contains the link
@@ -241,7 +246,8 @@ const CommentForm: FunctionComponent<Props> = ({
         link &&
         mediaConfig &&
         ((link.type === "twitter" && mediaConfig.twitter.enabled) ||
-          (link.type === "youtube" && mediaConfig.youtube.enabled))
+          (link.type === "youtube" && mediaConfig.youtube.enabled) ||
+          (link.type === "bluesky" && mediaConfig.bluesky.enabled))
       ) {
         setPastedMedia({ ...link });
       }
diff --git a/client/src/core/client/stream/tabs/Comments/Stream/CommentForm/MediaField.tsx b/client/src/core/client/stream/tabs/Comments/Stream/CommentForm/MediaField.tsx
index 47ba774383..fb3b2663ab 100644
--- a/client/src/core/client/stream/tabs/Comments/Stream/CommentForm/MediaField.tsx
+++ b/client/src/core/client/stream/tabs/Comments/Stream/CommentForm/MediaField.tsx
@@ -41,7 +41,7 @@ interface Props {
 
 interface Media {
   id?: string;
-  type: "giphy" | "tenor" | "twitter" | "youtube" | "external";
+  type: "giphy" | "tenor" | "twitter" | "bluesky" | "youtube" | "external";
   url: string;
   width?: string;
   height?: string;
diff --git a/client/src/core/client/stream/tabs/Comments/Stream/PostCommentForm/PostCommentFormContainer.tsx b/client/src/core/client/stream/tabs/Comments/Stream/PostCommentForm/PostCommentFormContainer.tsx
index 2f9b126872..91981223d7 100644
--- a/client/src/core/client/stream/tabs/Comments/Stream/PostCommentForm/PostCommentFormContainer.tsx
+++ b/client/src/core/client/stream/tabs/Comments/Stream/PostCommentForm/PostCommentFormContainer.tsx
@@ -411,6 +411,9 @@ const enhanced = withFragmentContainer<Props>({
         twitter {
           enabled
         }
+        bluesky {
+          enabled
+        }
         youtube {
           enabled
         }
diff --git a/client/src/core/client/stream/test/fixtures.ts b/client/src/core/client/stream/test/fixtures.ts
index c30cd4abb2..0e6af242d8 100644
--- a/client/src/core/client/stream/test/fixtures.ts
+++ b/client/src/core/client/stream/test/fixtures.ts
@@ -120,6 +120,7 @@ export const settings = createFixture<GQLSettings>({
   },
   media: {
     twitter: { enabled: false },
+    bluesky: { enabled: false },
     youtube: { enabled: false },
     gifs: { enabled: false },
     external: { enabled: false },
diff --git a/client/src/core/client/ui/components/icons/BlueskyLogoIcon.tsx b/client/src/core/client/ui/components/icons/BlueskyLogoIcon.tsx
new file mode 100644
index 0000000000..c75737a01d
--- /dev/null
+++ b/client/src/core/client/ui/components/icons/BlueskyLogoIcon.tsx
@@ -0,0 +1,20 @@
+import React, { FunctionComponent } from "react";
+
+// Bluesky Streamline Icon: https://streamlinehq.com
+// https://www.streamlinehq.com/icons/download/bluesky--29494
+const BlueskyLogoIcon: FunctionComponent = () => {
+  return (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      viewBox="0 0 576 576"
+      id="Bluesky--Streamline-Font-Awesome"
+    >
+      <path
+        d="M405.404 325.9411c-3.234 -0.392 -6.566 -0.784 -9.8 -1.274 3.332 0.392 6.566 0.882 9.8 1.274ZM288 259.6931c-25.578 -49.686 -95.158 -142.296 -159.838 -187.964 -62.034 -43.806 -85.652 -36.26 -101.234 -29.204C8.994 50.6591 5.76 78.1971 5.76 94.3671s8.918 132.888 14.7 152.39c19.11 64.386 87.318 86.142 150.136 79.086 3.234 -0.49 6.468 -0.882 9.8 -1.372 -3.234 0.49 -6.468 0.98 -9.8 1.372 -92.022 13.72 -173.754 47.236 -66.542 166.502 117.894 122.108 161.504 -26.166 183.946 -101.332 22.442 75.166 48.216 218.05 181.888 101.332 100.352 -101.332 27.538 -152.88 -64.484 -166.502 -3.234 -0.392 -6.566 -0.784 -9.8 -1.274 3.332 0.392 6.566 0.882 9.8 1.274 62.818 6.958 130.928 -14.798 150.136 -79.086 5.782 -19.502 14.7 -136.122 14.7 -152.39s-3.234 -43.806 -21.168 -51.842c-15.484 -6.958 -39.2 -14.602 -101.136 29.204 -64.778 45.668 -134.358 138.278 -159.936 187.964Z"
+        fill="currentColor"
+      ></path>
+    </svg>
+  );
+};
+
+export default BlueskyLogoIcon;
diff --git a/client/src/core/client/ui/components/icons/index.ts b/client/src/core/client/ui/components/icons/index.ts
index 902e8e1d22..87cd4cbc4a 100644
--- a/client/src/core/client/ui/components/icons/index.ts
+++ b/client/src/core/client/ui/components/icons/index.ts
@@ -92,3 +92,4 @@ export { default as VideoPlayerIcon } from "./VideoPlayerIcon";
 export { default as ViewIcon } from "./ViewIcon";
 export { default as ViewOffIcon } from "./ViewOffIcon";
 export { default as XLogoTwitterIcon } from "./XLogoTwitterIcon";
+export { default as BlueskyLogoIcon } from "./BlueskyLogoIcon";
diff --git a/common/lib/helpers/findMediaLinks.ts b/common/lib/helpers/findMediaLinks.ts
index 4ece009f96..dd5b5acc7c 100644
--- a/common/lib/helpers/findMediaLinks.ts
+++ b/common/lib/helpers/findMediaLinks.ts
@@ -1,4 +1,4 @@
-type MediaType = "twitter" | "youtube" | "external";
+type MediaType = "twitter" | "youtube" | "external" | "bluesky";
 
 export interface MediaLink {
   type: MediaType;
@@ -11,7 +11,8 @@ export function isMediaLink<T extends {}>(
   if (
     ((link as MediaLink).type === "twitter" ||
       (link as MediaLink).type === "external" ||
-      (link as MediaLink).type === "youtube") &&
+      (link as MediaLink).type === "youtube" ||
+      (link as MediaLink).type === "bluesky") &&
     (link as MediaLink).url
   ) {
     return true;
@@ -43,6 +44,11 @@ const patterns: ReadonlyArray<{ type: MediaType; pattern: RegExp }> = [
     pattern:
       /(https?:\/\/)?(www\.|mobile\.)?(x\.com\/[a-zA-z0-9]+\/status\/[0-9]+)/g,
   },
+  {
+    type: "bluesky",
+    pattern:
+      /(https?:\/\/)?(bsky\.app)?(\/profile\/[a-zA-z0-9\.]+\/post\/[a-zA-z0-9\.]+)/g,
+  },
 ];
 
 export function findMediaLinks(body: string): MediaLink[] {
diff --git a/locales/en-US/admin.ftl b/locales/en-US/admin.ftl
index b3e8d9f687..ff564a84ac 100644
--- a/locales/en-US/admin.ftl
+++ b/locales/en-US/admin.ftl
@@ -435,6 +435,7 @@ configure-general-embedLinks-desc =
 configure-general-embedLinks-description = 
   Allow commenters to add a YouTube video, X post or GIF's to the end of their comment
 configure-general-embedLinks-enableTwitterEmbeds = Allow X post embeds
+configure-general-embedLinks-enableBlueskyEmbeds = Allow Bluesky post embeds
 configure-general-embedLinks-enableYouTubeEmbeds = Allow YouTube embeds
 configure-general-embedLinks-enableGifs = Allow GIFs
 configure-general-embedLinks-enableExternalEmbeds = Enable external media
diff --git a/locales/en-US/stream.ftl b/locales/en-US/stream.ftl
index dcaa5b8557..3a260de040 100644
--- a/locales/en-US/stream.ftl
+++ b/locales/en-US/stream.ftl
@@ -133,8 +133,10 @@ comments-postComment-insertImage = Insert
 
 comments-postComment-confirmMedia-youtube = Add this YouTube video to the end of your comment?
 comments-postComment-confirmMedia-twitter = Add this post to the end of your comment?
+comments-postComment-confirmMedia-bluesky = Add this post to the end of your comment?
 comments-postComment-confirmMedia-cancel = Cancel
 comments-postComment-confirmMedia-add-tweet = Add post
+comments-postComment-confirmMedia-add-bluesky = Add post
 comments-postComment-confirmMedia-add-video = Add video
 comments-postComment-confirmMedia-remove = Remove
 comments-commentForm-gifPreview-remove = Remove
@@ -478,6 +480,9 @@ comments-embedLinks-hide-youtube = Hide video
 comments-embedLinks-show-twitter = Show post
 comments-embedLinks-hide-twitter = Hide post
 
+comments-embedLinks-show-bluesky = Show post
+comments-embedLinks-hide-bluesky = Hide post
+
 comments-embedLinks-show-external = Show image
 comments-embedLinks-hide-external = Hide image
 
diff --git a/server/src/core/server/app/handlers/api/oembed.ts b/server/src/core/server/app/handlers/api/oembed.ts
index a4976fffd2..d4b4e02db7 100644
--- a/server/src/core/server/app/handlers/api/oembed.ts
+++ b/server/src/core/server/app/handlers/api/oembed.ts
@@ -14,13 +14,13 @@ import { RequestHandler, TenantCoralRequest } from "coral-server/types/express";
 
 const OEmbedQuerySchema = Joi.object().keys({
   url: Joi.string().uri().required(),
-  type: Joi.string().allow("twitter", "youtube").only(),
+  type: Joi.string().allow("twitter", "youtube", "bluesky").only(),
   maxWidth: Joi.number().optional(),
   commentID: Joi.string().optional(),
 });
 
 interface OEmbedQuery {
-  type: "twitter" | "youtube";
+  type: "twitter" | "youtube" | "bluesky";
   url: string;
   maxWidth?: number;
   commentID?: string;
diff --git a/server/src/core/server/graph/resolvers/BlueskyMediaConfiguration.ts b/server/src/core/server/graph/resolvers/BlueskyMediaConfiguration.ts
new file mode 100644
index 0000000000..4f071271a0
--- /dev/null
+++ b/server/src/core/server/graph/resolvers/BlueskyMediaConfiguration.ts
@@ -0,0 +1,12 @@
+import {
+  GQLBlueskyMediaConfiguration,
+  GQLBlueskyMediaConfigurationTypeResolver,
+} from "coral-server/graph/schema/__generated__/types";
+
+export const BlueskyMediaConfiguration: Required<
+  GQLBlueskyMediaConfigurationTypeResolver<
+    Partial<GQLBlueskyMediaConfiguration>
+  >
+> = {
+  enabled: ({ enabled = false }) => enabled,
+};
diff --git a/server/src/core/server/graph/resolvers/CommentMedia.ts b/server/src/core/server/graph/resolvers/CommentMedia.ts
index 7ea2d346f5..36c8f6a6b2 100644
--- a/server/src/core/server/graph/resolvers/CommentMedia.ts
+++ b/server/src/core/server/graph/resolvers/CommentMedia.ts
@@ -14,6 +14,8 @@ const resolveType: GQLCommentMediaTypeResolver<comment.CommentMedia> = (
       return "YouTubeMedia";
     case "twitter":
       return "TwitterMedia";
+    case "bluesky":
+      return "BlueskyMedia";
     case "external":
       return "ExternalMedia";
     default:
diff --git a/server/src/core/server/graph/resolvers/MediaConfiguration.ts b/server/src/core/server/graph/resolvers/MediaConfiguration.ts
index 162fc66bfd..125f607120 100644
--- a/server/src/core/server/graph/resolvers/MediaConfiguration.ts
+++ b/server/src/core/server/graph/resolvers/MediaConfiguration.ts
@@ -7,6 +7,7 @@ export const MediaConfiguration: GQLMediaConfigurationTypeResolver<
   Partial<GQLMediaConfiguration>
 > = {
   twitter: ({ twitter = {} }) => twitter,
+  bluesky: ({ bluesky = {} }) => bluesky,
   youtube: ({ youtube = {} }) => youtube,
   gifs: ({ gifs = {} }) => gifs,
   external: () => ({}),
diff --git a/server/src/core/server/graph/resolvers/index.ts b/server/src/core/server/graph/resolvers/index.ts
index 2f409e177d..2089055f1e 100644
--- a/server/src/core/server/graph/resolvers/index.ts
+++ b/server/src/core/server/graph/resolvers/index.ts
@@ -10,6 +10,7 @@ import { AuthenticationTargetFilter } from "./AuthenticationTargetFilter";
 import { AuthIntegrations } from "./AuthIntegrations";
 import { BanStatus } from "./BanStatus";
 import { BanStatusHistory } from "./BanStatusHistory";
+import { BlueskyMediaConfiguration } from "./BlueskyMediaConfiguration";
 import { CloseCommenting } from "./CloseCommenting";
 import { Comment } from "./Comment";
 import { CommentCounts } from "./CommentCounts";
@@ -161,6 +162,7 @@ const Resolvers: GQLResolver = {
   Tag,
   Time,
   TwitterMediaConfiguration,
+  BlueskyMediaConfiguration,
   User,
   UserDeletionHistory,
   UserDeletionStatus,
diff --git a/server/src/core/server/graph/schema/schema.graphql b/server/src/core/server/graph/schema/schema.graphql
index 6630358328..132e8afe31 100644
--- a/server/src/core/server/graph/schema/schema.graphql
+++ b/server/src/core/server/graph/schema/schema.graphql
@@ -1539,6 +1539,7 @@ type GifMediaConfiguration {
   """
   key: String
 }
+
 type TwitterMediaConfiguration {
   """
   enabled is true when twitter media objects are enabled.
@@ -1546,6 +1547,13 @@ type TwitterMediaConfiguration {
   enabled: Boolean!
 }
 
+type BlueskyMediaConfiguration {
+  """
+  enabled is true when Bluesky media objects are enabled.
+  """
+  enabled: Boolean!
+}
+
 type YouTubeMediaConfiguration {
   """
   enabled is true when youtube media objects are enabled.
@@ -1566,6 +1574,11 @@ type MediaConfiguration {
   """
   twitter: TwitterMediaConfiguration!
 
+  """
+  bluesky is the configuration for Bluesky support.
+  """
+  bluesky: BlueskyMediaConfiguration!
+
   """
   youtube is the configuration for YouTube support.
   """
@@ -4091,6 +4104,21 @@ type TwitterMedia {
   width: Int
 }
 
+"""
+BlueskyMedia is a specific Bluesky Tweet.
+"""
+type BlueskyMedia {
+  """
+  url is the URL of a Bluesky tweet.
+  """
+  url: String!
+
+  """
+  width is the width of the Bluesky tweet in pixels.
+  """
+  width: Int
+}
+
 """
 YouTubeMedia is a specific YouTube video.
 """
@@ -4152,6 +4180,7 @@ union CommentMedia =
   | YouTubeMedia
   | ExternalMedia
   | TenorMedia
+  | BlueskyMedia
 
 type CommentRevision {
   """
@@ -6428,6 +6457,13 @@ input TwitterMediaConfigurationInput {
   enabled: Boolean
 }
 
+input BlueskyMediaConfigurationInput {
+  """
+  enabled is true when Bluesky media objects are enabled.
+  """
+  enabled: Boolean
+}
+
 input YouTubeMediaConfigurationInput {
   """
   enabled is true when youtube media objects are enabled.
@@ -6463,6 +6499,11 @@ input MediaConfigurationInput {
   """
   twitter: TwitterMediaConfigurationInput
 
+  """
+  bluesky is the configuration for Bluesky support.
+  """
+  bluesky: BlueskyMediaConfigurationInput
+
   """
   youtube is the configuration for YouTube support.
   """
diff --git a/server/src/core/server/models/comment/revision.ts b/server/src/core/server/models/comment/revision.ts
index d6151cc920..f1f3952659 100644
--- a/server/src/core/server/models/comment/revision.ts
+++ b/server/src/core/server/models/comment/revision.ts
@@ -112,6 +112,12 @@ export interface TwitterMedia {
   width?: number;
 }
 
+export interface BlueskyMedia {
+  type: "bluesky";
+  url: string;
+  width?: number;
+}
+
 export interface YouTubeMedia {
   type: "youtube";
   url: string;
@@ -132,6 +138,7 @@ export type CommentMedia =
   | GiphyMedia
   | TenorMedia
   | TwitterMedia
+  | BlueskyMedia
   | YouTubeMedia
   | ExternalMedia;
 
diff --git a/server/src/core/server/models/tenant/helpers.ts b/server/src/core/server/models/tenant/helpers.ts
index 4ddf27d79a..c559a539b0 100644
--- a/server/src/core/server/models/tenant/helpers.ts
+++ b/server/src/core/server/models/tenant/helpers.ts
@@ -108,13 +108,15 @@ export function getWebhookEndpoint(
 
 export function supportsMediaType(
   tenant: Pick<Tenant, "media" | "featureFlags">,
-  type: "twitter" | "youtube" | "giphy" | "tenor" | "external"
+  type: "twitter" | "bluesky" | "youtube" | "giphy" | "tenor" | "external"
 ): tenant is Omit<Tenant, "media"> & Required<Pick<Tenant, "media">> {
   switch (type) {
     case "external":
       return hasFeatureFlag(tenant, GQLFEATURE_FLAG.EXTERNAL_MEDIA);
     case "twitter":
       return !!tenant.media?.twitter.enabled;
+    case "bluesky":
+      return !!tenant.media?.bluesky.enabled;
     case "youtube":
       return !!tenant.media?.youtube.enabled;
     case "giphy":
diff --git a/server/src/core/server/services/comments/media.ts b/server/src/core/server/services/comments/media.ts
index 632e5d5898..b07c096c35 100644
--- a/server/src/core/server/services/comments/media.ts
+++ b/server/src/core/server/services/comments/media.ts
@@ -2,6 +2,7 @@ import { findMediaLinks } from "coral-common/common/lib/helpers/findMediaLinks";
 import validateImagePathname from "coral-common/common/lib/helpers/validateImagePathname";
 import { WrappedInternalError } from "coral-server/errors";
 import {
+  BlueskyMedia,
   ExternalMedia,
   GiphyMedia,
   TenorMedia,
@@ -113,10 +114,10 @@ async function attachExternalMedia(
 }
 
 async function attachOEmbedMedia(
-  type: "twitter" | "youtube",
+  type: "twitter" | "youtube" | "bluesky",
   url: string,
   body: string
-): Promise<YouTubeMedia | TwitterMedia | undefined> {
+): Promise<YouTubeMedia | TwitterMedia | BlueskyMedia | undefined> {
   // Find all the media links in the body.
   const links = findMediaLinks(body);
   if (!links) {
@@ -157,19 +158,31 @@ async function attachOEmbedMedia(
       };
     }
 
-    // Return the formed TwitterMedia.
-    return {
-      type: "twitter",
-      url,
-      width,
-    };
+    if (type === "twitter") {
+      // Return the formed TwitterMedia.
+      return {
+        type: "twitter",
+        url,
+        width,
+      };
+    }
+
+    if (type === "bluesky") {
+      return {
+        type: "bluesky",
+        url,
+        width,
+      };
+    }
+
+    return undefined;
   } catch (err) {
     throw new WrappedInternalError(err as Error, "cannot attach oEmbed Media");
   }
 }
 
 export interface CreateCommentMediaInput {
-  type: "giphy" | "tenor" | "twitter" | "youtube" | "external";
+  type: "giphy" | "tenor" | "twitter" | "bluesky" | "youtube" | "external";
   url: string;
   id?: string;
   width?: string;
@@ -206,6 +219,7 @@ export async function attachMedia(
       return attachExternalMedia(input.url, input.width, input.height);
     case "twitter":
     case "youtube":
+    case "bluesky":
       return attachOEmbedMedia(input.type, input.url, body);
     default:
       throw new Error("invalid media type");
diff --git a/server/src/core/server/services/oembed/oembed.ts b/server/src/core/server/services/oembed/oembed.ts
index c72a6af1b3..be9a1a9eca 100644
--- a/server/src/core/server/services/oembed/oembed.ts
+++ b/server/src/core/server/services/oembed/oembed.ts
@@ -27,7 +27,7 @@ export interface OEmbedResponse {
 const fetch = createFetch({ name: "oEmbed-fetch" });
 
 export async function fetchOEmbedResponse(
-  type: "twitter" | "youtube",
+  type: "twitter" | "youtube" | "bluesky",
   url: string,
   maxWidth?: number
 ) {
@@ -45,7 +45,10 @@ export async function fetchOEmbedResponse(
     }
     case "twitter": {
       uri = `https://publish.twitter.com/oembed?url=${encodeURIComponent(url)}`;
-
+      break;
+    }
+    case "bluesky": {
+      uri = `https://embed.bsky.app/oembed?url=${encodeURIComponent(url)}`;
       break;
     }
     default:
diff --git a/server/src/core/server/stacks/editComment.ts b/server/src/core/server/stacks/editComment.ts
index 25a17421ff..ab69f0b7ea 100644
--- a/server/src/core/server/stacks/editComment.ts
+++ b/server/src/core/server/stacks/editComment.ts
@@ -17,8 +17,8 @@ import {
   EncodedCommentActionCounts,
   filterDuplicateActions,
 } from "coral-server/models/action/comment";
-
 import {
+  BlueskyMedia,
   editComment,
   EditCommentInput,
   ExternalMedia,
@@ -164,6 +164,7 @@ export default async function edit(
     | GiphyMedia
     | TenorMedia
     | TwitterMedia
+    | BlueskyMedia
     | YouTubeMedia
     | ExternalMedia
     | undefined;