diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoService.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoService.java
index 0aed9eac3..1d463a429 100644
--- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoService.java
+++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoService.java
@@ -384,6 +384,10 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
             if (OmemoConfiguration.getIgnoreStaleDevices()) {
 
                 Date lastActivity = getOmemoStoreBackend().getDateOfLastReceivedMessage(userDevice, contactsDevice);
+                if (lastActivity == null) {
+                    lastActivity = new Date();
+                    getOmemoStoreBackend().setDateOfLastReceivedMessage(userDevice, contactsDevice, lastActivity);
+                }
 
                 if (isStale(userDevice, contactsDevice, lastActivity, OmemoConfiguration.getIgnoreStaleDevicesAfterHours())) {
                     LOGGER.log(Level.FINE, "Device " + contactsDevice + " seems to be stale (last message received "
@@ -1038,6 +1042,10 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
             return false;
         }
 
+        if (lastReceipt == null) {
+            return false;
+        }
+
         long maxAgeMillis = MILLIS_PER_HOUR * maxAgeHours;
         Date now = new Date();