diff --git a/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java b/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java
index de1b227088..023159b71b 100644
--- a/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java
+++ b/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java
@@ -443,7 +443,11 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
 
     @Override
     public void onModified(final Recipient recipient) {
-      Util.runOnMain(() -> setSummaries(recipient));
+      Util.runOnMain(() -> {
+        if (getContext() != null && getActivity() != null && !getActivity().isFinishing()) {
+          setSummaries(recipient);
+        }
+      });
     }
 
     private class RingtoneChangeListener implements Preference.OnPreferenceChangeListener {