diff --git a/DeviceSettings/src/org/lineageos/settings/device/speaker/ClearSpeakerFragment.java b/DeviceSettings/src/org/lineageos/settings/device/speaker/ClearSpeakerFragment.java
index 3dfd6651..a218bc0f 100644
--- a/DeviceSettings/src/org/lineageos/settings/device/speaker/ClearSpeakerFragment.java
+++ b/DeviceSettings/src/org/lineageos/settings/device/speaker/ClearSpeakerFragment.java
@@ -77,8 +77,8 @@ public class ClearSpeakerFragment extends PreferenceFragment implements
 
     @Override
     public void onStop() {
-        stopPlaying();
         super.onStop();
+        stopPlaying();
     }
 
     public boolean startPlaying() {
@@ -107,9 +107,12 @@ public class ClearSpeakerFragment extends PreferenceFragment implements
 
     public void stopPlaying() {
         if (mMediaPlayer != null) {
-            mMediaPlayer.stop();
-            mMediaPlayer.reset();
-            mMediaPlayer.release();
+            if (mMediaPlayer.isPlaying()) {
+                mMediaPlayer.stop();
+                mMediaPlayer.reset();
+                mMediaPlayer.release();
+                mMediaPlayer=null;
+            }
         }
         mAudioManager.setParameters("status_earpiece_clean=off");
         mClearSpeakerPref.setEnabled(true);