diff --git a/assets/src/media/modal/messageHandler.js b/assets/src/media/modal/messageHandler.js
index 220552b7..7c9cae2e 100644
--- a/assets/src/media/modal/messageHandler.js
+++ b/assets/src/media/modal/messageHandler.js
@@ -150,7 +150,7 @@ class MessageHandler {
 			attachment.fetch().then( ( r ) => {
 				attachmentsQueue.push( r );
 
-				if ( idx === result.data.length - 1 ) {
+				if ( attachmentsQueue.length === result.data.length ) {
 					this.sendMessage({ status: 'done' });
 
 					// Add the attachments to the selection.