diff --git a/src/org/thoughtcrime/securesms/ConversationListActivity.java b/src/org/thoughtcrime/securesms/ConversationListActivity.java
index 5be339cf17..96c9e0e84f 100644
--- a/src/org/thoughtcrime/securesms/ConversationListActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationListActivity.java
@@ -221,10 +221,8 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
     profilePictureImageView.setClipToOutline(true);
 
     // Display the correct identicon if we're a secondary device
-    String currentUser = TextSecurePreferences.getLocalNumber(this);
-    String recipientAddress = recipient.getAddress().serialize();
     String primaryAddress = TextSecurePreferences.getMasterHexEncodedPublicKey(this);
-    String profileAddress = (recipientAddress.equalsIgnoreCase(currentUser) && primaryAddress != null) ? primaryAddress : recipientAddress;
+    String profileAddress = (recipient.isLocalNumber() && primaryAddress != null) ? primaryAddress : recipient.getAddress().serialize();
     Recipient primaryRecipient = Recipient.from(this, Address.fromSerialized(profileAddress), false);
 
     Drawable fallback = primaryRecipient.getFallbackContactPhotoDrawable(this, false);
@@ -341,9 +339,7 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
   @Subscribe(threadMode = ThreadMode.MAIN)
   public void onAvatarModified(RecipientAvatarModifiedEvent event) {
     Recipient recipient = event.getRecipient();
-    String ourMasterHexEncodedPublicKey = TextSecurePreferences.getMasterHexEncodedPublicKey(this);
-    boolean isOurMasterDevice = ourMasterHexEncodedPublicKey != null && ourMasterHexEncodedPublicKey.equals(recipient.getAddress().serialize());
-    if (recipient.isLocalNumber() || isOurMasterDevice) {
+    if (recipient.isLocalNumber() || recipient.isOurMasterDevice()) {
       initializeProfileIcon(recipient);
     }
   }
diff --git a/src/org/thoughtcrime/securesms/recipients/Recipient.java b/src/org/thoughtcrime/securesms/recipients/Recipient.java
index 0528206438..2bdfa8eafe 100644
--- a/src/org/thoughtcrime/securesms/recipients/Recipient.java
+++ b/src/org/thoughtcrime/securesms/recipients/Recipient.java
@@ -279,6 +279,11 @@ public class Recipient implements RecipientModifiedListener {
     return isLocalNumber;
   }
 
+  public boolean isOurMasterDevice() {
+    String ourMasterDevice = TextSecurePreferences.getMasterHexEncodedPublicKey(context);
+    return ourMasterDevice != null && ourMasterDevice.equals(getAddress().serialize());
+  }
+
   public synchronized @Nullable Uri getContactUri() {
     return this.contactUri;
   }