diff --git a/core/java/com/android/internal/app/RingtonePickerActivity.java b/core/java/com/android/internal/app/RingtonePickerActivity.java
index 5a0fea383d846..ddddabefba33e 100644
--- a/core/java/com/android/internal/app/RingtonePickerActivity.java
+++ b/core/java/com/android/internal/app/RingtonePickerActivity.java
@@ -276,6 +276,7 @@ public final class RingtonePickerActivity extends AlertActivity implements
     public void run() {
         
         if (mSampleRingtonePos == mSilentPos) {
+            mRingtoneManager.stopPreviousRingtone();
             return;
         }