diff --git a/src/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java b/src/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java
index eb416a6dd8..1cff017f5e 100644
--- a/src/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java
@@ -171,7 +171,7 @@ public class RetrieveProfileJob extends ContextJob implements InjectableType {
     RecipientDatabase recipientDatabase = DatabaseFactory.getRecipientDatabase(context);
     byte[]            profileKey        = recipient.getProfileKey();
 
-    if (unrestrictedUnidentifiedAccess) {
+    if (unrestrictedUnidentifiedAccess && unidentifiedAccessVerifier != null) {
       Log.i(TAG, "Marking recipient UD status as unrestricted.");
       recipientDatabase.setUnidentifiedAccessMode(recipient, UnidentifiedAccessMode.UNRESTRICTED);
     } else if (profileKey == null || unidentifiedAccessVerifier == null) {