diff --git a/src/util/Injected.js b/src/util/Injected.js
index a4e97ac..706526d 100644
--- a/src/util/Injected.js
+++ b/src/util/Injected.js
@@ -40,7 +40,9 @@ exports.LoadUtils = () => {
             delete options.quotedMessageId;
         }
 
-        options.mentionedJidList = options.mentionedJidList.map(cId=> window.Store.Contact.get(cId).id);
+        if (options.mentionedJidList) {
+            options.mentionedJidList = options.mentionedJidList.map(cId=> window.Store.Contact.get(cId).id);
+        }
 
         let locationOptions = {};
         if (options.location) {
@@ -92,6 +94,14 @@ exports.LoadUtils = () => {
             isGif: mediaData.isGif
         });
 
+        if(!(mediaData.mediaBlob instanceof window.Store.OpaqueData.default)) {
+            mediaData.mediaBlob = await window.Store.OpaqueData.default.createFromData(mediaData.mediaBlob, mediaData.mediaBlob.type);
+        } 
+
+        mediaData.renderableUrl = mediaData.mediaBlob.url();
+        mediaObject.consolidate(mediaData.toJSON());
+        mediaData.mediaBlob.autorelease();
+
         const uploadedMedia = await window.Store.MediaUpload.uploadMedia(mediaData.mimetype, mediaObject, mediaType);
         if (!uploadedMedia) {
             throw new Error('upload failed: media entry was not created');