diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsManager.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsManager.java
index 0b30f728a..4f402c531 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsManager.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsManager.java
@@ -1582,7 +1582,13 @@ public class AccountsManager extends RedisPubSubAdapter<String, String> implemen
 
       Optional.ofNullable(waitForDeviceFuturesByTokenIdentifier.remove(tokenIdentifier))
           .ifPresent(future -> pubSubRedisClient.withConnection(connection -> connection.async().get(getLinkedDeviceKey(tokenIdentifier)))
-              .thenAccept(deviceInfoJson -> handleDeviceAdded(future, deviceInfoJson)));
+              .whenComplete((deviceInfoJson, throwable) -> {
+                if (throwable != null) {
+                  future.completeExceptionally(throwable);
+                } else {
+                  handleDeviceAdded(future, deviceInfoJson);
+                }
+              }));
     } else if (TRANSFER_ARCHIVE_KEYSPACE_PATTERN.equals(pattern) && "set".equalsIgnoreCase(message)) {
       // The `- 1` here compensates for the '*' in the pattern
       final String[] deviceIdentifierComponents =
@@ -1607,7 +1613,13 @@ public class AccountsManager extends RedisPubSubAdapter<String, String> implemen
 
         Optional.ofNullable(waitForTransferArchiveFuturesByDeviceIdentifier.remove(deviceIdentifier))
             .ifPresent(future -> pubSubRedisClient.withConnection(connection -> connection.async().get(transferArchiveKey))
-                .thenAccept(transferArchiveJson -> handleTransferArchiveAdded(future, transferArchiveJson)));
+                .whenComplete((transferArchiveJson, throwable) -> {
+                  if (throwable != null) {
+                    future.completeExceptionally(throwable);
+                  } else {
+                    handleTransferArchiveAdded(future, transferArchiveJson);
+                  }
+                }));
       } catch (final IllegalArgumentException e) {
         logger.error("Could not parse timestamped device identifier", e);
       }
@@ -1618,7 +1630,13 @@ public class AccountsManager extends RedisPubSubAdapter<String, String> implemen
       Optional.ofNullable(waitForRestoreAccountRequestFuturesByToken.remove(token))
           .ifPresent(future -> pubSubRedisClient.withConnection(connection -> connection.async().get(
                   getRestoreAccountRequestKey(token)))
-              .thenAccept(requestJson -> handleRestoreAccountRequest(future, requestJson)));
+              .whenComplete((requestJson, throwable) -> {
+                if (throwable != null) {
+                  future.completeExceptionally(throwable);
+                } else {
+                  handleRestoreAccountRequest(future, requestJson);
+                }
+              }));
     }
   }