diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 92e4cf35e05ce4ee0bde6a9bca73f8445faa3c3d..60815f5e054f8a546d9cccb3b530c388512a9ecf 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -755,9 +755,8 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 					}
 					break;
 				case Message.ENCRYPTION_AXOLOTL:
-					message.setStatus(Message.STATUS_WAITING);
 					packet = account.getAxolotlService().fetchPacketFromCache(message);
-					if (packet == null && account.isOnlineAndConnected()) {
+					if (packet == null) {
 						account.getAxolotlService().prepareMessage(message);
 						message.setAxolotlFingerprint(account.getAxolotlService().getOwnPublicKey().getFingerprint().replaceAll("\\s", ""));
 					}