diff --git a/src/atoms/global.ts b/src/atoms/global.ts
index 506a8d4..0e0dc42 100644
--- a/src/atoms/global.ts
+++ b/src/atoms/global.ts
@@ -130,3 +130,9 @@ export const blobKeySelector = selectorFamily({
     return blobs[key] || null; // Return the value for the key or null if not found
   },
 });
+
+
+export const selectedGroupIdAtom = atom({
+  key: 'selectedGroupIdAtom', 
+  default: null, 
+});
\ No newline at end of file
diff --git a/src/components/Embeds/AttachmentEmbed.tsx b/src/components/Embeds/AttachmentEmbed.tsx
index b1290b2..e335e18 100644
--- a/src/components/Embeds/AttachmentEmbed.tsx
+++ b/src/components/Embeds/AttachmentEmbed.tsx
@@ -41,7 +41,8 @@ export const AttachmentCard = ({
     errorMsg,
     encryptionType,
     setInfoSnack,
-    setOpenSnack
+    setOpenSnack,
+    selectedGroupId
   }) => {
 
     const [isOpen, setIsOpen] = useState(true);
@@ -100,7 +101,7 @@ export const AttachmentCard = ({
              
                 {
                   data64: data,
-                groupId: 683,
+                groupId:  selectedGroupId,
                 }
               
             );
diff --git a/src/components/Embeds/Embed.tsx b/src/components/Embeds/Embed.tsx
index b5d4c82..45ebd64 100644
--- a/src/components/Embeds/Embed.tsx
+++ b/src/components/Embeds/Embed.tsx
@@ -8,8 +8,8 @@ import { extractComponents } from "../Chat/MessageDisplay";
 import { executeEvent } from "../../utils/events";
 
 import { base64ToBlobUrl } from "../../utils/fileReading";
-import { useRecoilValue, useSetRecoilState } from "recoil";
-import { blobControllerAtom, blobKeySelector, resourceKeySelector } from "../../atoms/global";
+import { useRecoilState, useRecoilValue, useSetRecoilState } from "recoil";
+import { blobControllerAtom, blobKeySelector, resourceKeySelector, selectedGroupIdAtom } from "../../atoms/global";
 import { parseQortalLink } from "./embed-utils";
 import { PollCard } from "./PollEmbed";
 import { ImageCard } from "./ImageEmbed";
@@ -59,6 +59,7 @@ export const Embed = ({ embedLink }) => {
   const [imageUrl, setImageUrl] = useState("");
   const [parsedData, setParsedData] = useState(null);
   const setBlobs = useSetRecoilState(blobControllerAtom);
+  const [selectedGroupId] = useRecoilState(selectedGroupIdAtom)
 
   const resourceData = useMemo(()=> {
     const parsedDataOnTheFly = parseQortalLink(embedLink);
@@ -153,7 +154,7 @@ export const Embed = ({ embedLink }) => {
                    
                       {
                         data64: data,
-                      groupId: 683,
+                      groupId: selectedGroupId,
                       }
                     
                   );
@@ -163,7 +164,7 @@ export const Embed = ({ embedLink }) => {
               }
               
               if (!decryptedData || decryptedData?.error) throw new Error("Could not decrypt data");
-               imageFinalUrl = base64ToBlobUrl(decryptedData)
+              imageFinalUrl = base64ToBlobUrl(decryptedData, parsedData?.mimeType ? decodeURIComponent(parsedData?.mimeType) : undefined)
                setBlobs((prev=> {
                 return {
                   ...prev,
@@ -357,6 +358,8 @@ export const Embed = ({ embedLink }) => {
           isLoadingParent={isLoading}
           errorMsg={errorMsg}
           encryptionType={encryptionType}
+          selectedGroupId={selectedGroupId}
+
         />
       )}
       <CustomizedSnackbars
diff --git a/src/components/Group/Group.tsx b/src/components/Group/Group.tsx
index 1be20d1..f1c145a 100644
--- a/src/components/Group/Group.tsx
+++ b/src/components/Group/Group.tsx
@@ -94,6 +94,8 @@ import { AppsDesktop } from "../Apps/AppsDesktop";
 import { formatEmailDate } from "./QMailMessages";
 import { useHandleMobileNativeBack } from "../../hooks/useHandleMobileNativeBack";
 import { AdminSpace } from "../Chat/AdminSpace";
+import { useSetRecoilState } from "recoil";
+import { selectedGroupIdAtom } from "../../atoms/global";
 
 // let touchStartY = 0;
 // let disablePullToRefresh = false;
@@ -473,6 +475,7 @@ export const Group = ({
   const [appsMode, setAppsMode] = useState('home')
   const [isOpenSideViewDirects, setIsOpenSideViewDirects] = useState(false)
   const [isOpenSideViewGroups, setIsOpenSideViewGroups] = useState(false)
+  const setSelectedGroupId = useSetRecoilState(selectedGroupIdAtom)
   const toggleSideViewDirects = ()=> {
     if(isOpenSideViewGroups){
       setIsOpenSideViewGroups(false)
@@ -498,6 +501,8 @@ export const Group = ({
 
   useEffect(() => {
     selectedGroupRef.current = selectedGroup;
+    setSelectedGroupId(selectedGroup?.groupId)
+
   }, [selectedGroup]);
 
   useEffect(() => {