diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java
index 44ce3075d7d..2468119eb22 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java
@@ -46,6 +46,7 @@
 import org.thoughtcrime.securesms.database.SmsDatabase;
 import org.thoughtcrime.securesms.database.ThreadDatabase;
 import org.thoughtcrime.securesms.database.model.ThreadRecord;
+import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.recipients.LiveRecipient;
 import org.thoughtcrime.securesms.recipients.Recipient;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java
index b17e61eceb6..59448aa2209 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java
@@ -1021,8 +1021,9 @@ private void setInsightsBannerTier(@NonNull RecipientId id, @NonNull InsightsBan
   public void setExpireMessages(@NonNull RecipientId id, int expiration) {
     ContentValues values = new ContentValues(1);
     values.put(MESSAGE_EXPIRATION_TIME, expiration);
-    update(id, values);
-    Recipient.live(id).refresh();
+    if (update(id, values)) {
+      Recipient.live(id).refresh();
+    }
   }
 
   public void setUnidentifiedAccessMode(@NonNull RecipientId id, @NonNull UnidentifiedAccessMode unidentifiedAccessMode) {
@@ -1030,16 +1031,17 @@ public void setUnidentifiedAccessMode(@NonNull RecipientId id, @NonNull Unidenti
     values.put(UNIDENTIFIED_ACCESS_MODE, unidentifiedAccessMode.getMode());
     if (update(id, values)) {
       markDirty(id, DirtyState.UPDATE);
+      Recipient.live(id).refresh();
     }
-    Recipient.live(id).refresh();
   }
 
   public void setCapabilities(@NonNull RecipientId id, @NonNull SignalServiceProfile.Capabilities capabilities) {
     ContentValues values = new ContentValues(2);
     values.put(UUID_CAPABILITY,      Recipient.Capability.fromBoolean(capabilities.isUuid()).serialize());
     values.put(GROUPS_V2_CAPABILITY, Recipient.Capability.fromBoolean(capabilities.isGv2()).serialize());
-    update(id, values);
-    Recipient.live(id).refresh();
+    if (update(id, values)) {
+      Recipient.live(id).refresh();
+    }
   }
 
   /**