diff --git a/js/libtextsecure.js b/js/libtextsecure.js
index ea08a931be3..a28b064deb6 100644
--- a/js/libtextsecure.js
+++ b/js/libtextsecure.js
@@ -37818,9 +37818,9 @@ var TextSecureServer = (function() {
                 urlParameters       : '/' + id,
                 responseType        : 'json',
                 validateResponse    : {location: 'string'},
-                timeout             : 0
             }).then(function(response) {
                 return ajax(response.location, {
+                    timeout     : 0,
                     type        : "GET",
                     responseType: "arraybuffer",
                     contentType : "application/octet-stream"
@@ -37832,9 +37832,9 @@ var TextSecureServer = (function() {
                 call         : 'attachment',
                 httpType     : 'GET',
                 responseType : 'json',
-                timeout      : 0
             }).then(function(response) {
                 return ajax(response.location, {
+                    timeout     : 0,
                     type        : "PUT",
                     contentType : "application/octet-stream",
                     data        : encryptedBin,
diff --git a/libtextsecure/api.js b/libtextsecure/api.js
index 0ada610c43e..055f10ba334 100644
--- a/libtextsecure/api.js
+++ b/libtextsecure/api.js
@@ -381,9 +381,9 @@ var TextSecureServer = (function() {
                 urlParameters       : '/' + id,
                 responseType        : 'json',
                 validateResponse    : {location: 'string'},
-                timeout             : 0
             }).then(function(response) {
                 return ajax(response.location, {
+                    timeout     : 0,
                     type        : "GET",
                     responseType: "arraybuffer",
                     contentType : "application/octet-stream"
@@ -395,9 +395,9 @@ var TextSecureServer = (function() {
                 call         : 'attachment',
                 httpType     : 'GET',
                 responseType : 'json',
-                timeout      : 0
             }).then(function(response) {
                 return ajax(response.location, {
+                    timeout     : 0,
                     type        : "PUT",
                     contentType : "application/octet-stream",
                     data        : encryptedBin,