diff --git a/js/libtextsecure.js b/js/libtextsecure.js
index 8ed86b2ec..46c9c6d8e 100644
--- a/js/libtextsecure.js
+++ b/js/libtextsecure.js
@@ -39601,10 +39601,10 @@ window.textsecure.messaging = function() {
         groupId = getString(groupId);
 
         var doUpdate = false;
-        Promise.all(devicesForNumber.map(function(device) {
+        return Promise.all(devicesForNumber.map(function(device) {
             return textsecure.protocol_wrapper.getRegistrationId(device.encodedNumber).then(function(registrationId) {
                 return textsecure.storage.groups.needUpdateByDeviceRegistrationId(
-                    groupId, number, devicesForNumber[i].encodedNumber, registrationId
+                    groupId, number, device.encodedNumber, registrationId
                 ).then(function(needUpdate) {
                     if (needUpdate) doUpdate = true;
                 });
diff --git a/libtextsecure/sendmessage.js b/libtextsecure/sendmessage.js
index e304d332b..f3e4ce758 100644
--- a/libtextsecure/sendmessage.js
+++ b/libtextsecure/sendmessage.js
@@ -97,10 +97,10 @@ window.textsecure.messaging = function() {
         groupId = getString(groupId);
 
         var doUpdate = false;
-        Promise.all(devicesForNumber.map(function(device) {
+        return Promise.all(devicesForNumber.map(function(device) {
             return textsecure.protocol_wrapper.getRegistrationId(device.encodedNumber).then(function(registrationId) {
                 return textsecure.storage.groups.needUpdateByDeviceRegistrationId(
-                    groupId, number, devicesForNumber[i].encodedNumber, registrationId
+                    groupId, number, device.encodedNumber, registrationId
                 ).then(function(needUpdate) {
                     if (needUpdate) doUpdate = true;
                 });