diff --git a/src/structures/Message.js b/src/structures/Message.js
index bd5f891..8678214 100644
--- a/src/structures/Message.js
+++ b/src/structures/Message.js
@@ -449,7 +449,9 @@ class Message extends Base {
 
         const result = await this.client.pupPage.evaluate(async (msgId) => {
             const msg = window.Store.Msg.get(msgId) || (await window.Store.Msg.getMessagesById([msgId]))?.messages?.[0];
-            if (!msg || !msg.mediaData) {
+
+            // REUPLOADING mediaStage means the media is expired and the download button is spinning, cannot be downloaded now
+            if (!msg || !msg.mediaData || msg.mediaData.mediaStage === 'REUPLOADING') {
                 return null;
             }
             if (msg.mediaData.mediaStage != 'RESOLVED') {