diff --git a/src/structures/Message.js b/src/structures/Message.js
index a2c883f..35643d3 100644
--- a/src/structures/Message.js
+++ b/src/structures/Message.js
@@ -190,8 +190,14 @@ class Message extends Base {
             const msg = window.Store.Msg.get(msgId);
             
             if(msg.mediaData.mediaStage != 'RESOLVED') {
+                // try to resolve media
                 await msg.downloadMedia(true, 1);
             }
+            
+            if(msg.mediaData.mediaStage != 'RESOLVED') {
+                // media could not be downloaded
+                return undefined;
+            }
 
             const buffer = await window.WWebJS.downloadBuffer(msg.clientUrl);
             const decrypted = await window.Store.CryptoLib.decryptE2EMedia(msg.type, buffer, msg.mediaKey, msg.mimetype);