diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java index be4ac0ad38..3c9282c0af 100644 --- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java +++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java @@ -705,6 +705,11 @@ public class SignalServiceMessageSender { Content content; boolean urgent = false; + if (!aciStore.isMultiDevice()) { + Log.w(TAG, "We do not have any linked devices. Skipping."); + return SendMessageResult.success(localAddress, Collections.emptyList(), false, false, 0, Optional.empty()); + } + if (message.getContacts().isPresent()) { content = createMultiDeviceContactsContent(message.getContacts().get().getContactsStream().asStream(), message.getContacts().get().isComplete()); } else if (message.getRead().isPresent()) {