diff --git a/res/xml/recipient_preferences.xml b/res/xml/recipient_preferences.xml
index 8b205d8647..80f8423d71 100644
--- a/res/xml/recipient_preferences.xml
+++ b/res/xml/recipient_preferences.xml
@@ -9,7 +9,8 @@
             android:disableDependentsState="true"
             android:persistent="false" />
 
-    <RingtonePreference android:dependency="pref_key_recipient_mute"
+    <org.thoughtcrime.securesms.preferences.AdvancedRingtonePreference
+                        android:dependency="pref_key_recipient_mute"
                         android:key="pref_key_recipient_ringtone"
                         android:title="@string/recipient_preferences__ringtone"
                         android:ringtoneType="notification"
diff --git a/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java b/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java
index 9181c79036..ddca883352 100644
--- a/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java
+++ b/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java
@@ -12,7 +12,6 @@ import android.os.Handler;
 import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
-import android.preference.RingtonePreference;
 import android.provider.Settings;
 import android.support.annotation.NonNull;
 import android.support.v4.app.Fragment;
@@ -31,6 +30,7 @@ import org.thoughtcrime.securesms.components.AvatarImageView;
 import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.RecipientPreferenceDatabase.VibrateState;
+import org.thoughtcrime.securesms.preferences.AdvancedRingtonePreference;
 import org.thoughtcrime.securesms.preferences.ColorPreference;
 import org.thoughtcrime.securesms.recipients.RecipientFactory;
 import org.thoughtcrime.securesms.recipients.Recipients;
@@ -184,11 +184,11 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
     }
 
     private void setSummaries(Recipients recipients) {
-      CheckBoxPreference mutePreference     = (CheckBoxPreference) this.findPreference(PREFERENCE_MUTED);
-      RingtonePreference ringtonePreference = (RingtonePreference) this.findPreference(PREFERENCE_TONE);
-      ListPreference     vibratePreference  = (ListPreference)     this.findPreference(PREFERENCE_VIBRATE);
-      ColorPreference    colorPreference    = (ColorPreference)    this.findPreference(PREFERENCE_COLOR);
-      Preference         blockPreference    = this.findPreference(PREFERENCE_BLOCK);
+      CheckBoxPreference         mutePreference     = (CheckBoxPreference) this.findPreference(PREFERENCE_MUTED);
+      AdvancedRingtonePreference ringtonePreference = (AdvancedRingtonePreference) this.findPreference(PREFERENCE_TONE);
+      ListPreference             vibratePreference  = (ListPreference) this.findPreference(PREFERENCE_VIBRATE);
+      ColorPreference            colorPreference    = (ColorPreference) this.findPreference(PREFERENCE_COLOR);
+      Preference                 blockPreference    = this.findPreference(PREFERENCE_BLOCK);
 
       mutePreference.setChecked(recipients.isMuted());
 
@@ -197,6 +197,7 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
 
         if (tone != null) {
           ringtonePreference.setSummary(tone.getTitle(getActivity()));
+          ringtonePreference.setCurrentRingtone(recipients.getRingtone());
         }
       } else {
         ringtonePreference.setSummary(R.string.preferences__default);
diff --git a/src/org/thoughtcrime/securesms/preferences/AdvancedRingtonePreference.java b/src/org/thoughtcrime/securesms/preferences/AdvancedRingtonePreference.java
new file mode 100644
index 0000000000..5692e53187
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/preferences/AdvancedRingtonePreference.java
@@ -0,0 +1,31 @@
+package org.thoughtcrime.securesms.preferences;
+
+import android.content.Context;
+import android.net.Uri;
+import android.preference.RingtonePreference;
+import android.util.AttributeSet;
+
+
+public class AdvancedRingtonePreference extends RingtonePreference {
+
+  private Uri currentRingtone;
+
+  public AdvancedRingtonePreference(Context context, AttributeSet attrs, int defStyleAttr) {
+    super(context, attrs, defStyleAttr);
+  }
+  public AdvancedRingtonePreference(Context context, AttributeSet attrs) {
+    super(context, attrs);
+  }
+  public AdvancedRingtonePreference(Context context) {
+    super(context);
+  }
+
+  @Override
+  protected Uri onRestoreRingtone() {
+    return currentRingtone;
+  }
+
+  public void setCurrentRingtone(Uri uri) {
+    currentRingtone = uri;
+  }
+}