diff --git a/fmapp2/src/com/caf/fmradio/FMRadioService.java b/fmapp2/src/com/caf/fmradio/FMRadioService.java
index f3b0a78..df52734 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadioService.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadioService.java
@@ -902,7 +902,7 @@
            boolean bTempSpeaker = mSpeakerPhoneOn; //need to restore SpeakerPhone
            boolean bTempMute = mMuted;// need to restore Mute status
            int bTempCall = mCallStatus;//need to restore call status
-           if (fmOff()) {
+           if (isFmOn() && fmOff()) {
                if((mServiceInUse) && (mCallbacks != null)) {
                    try {
                         mCallbacks.onDisabled();
@@ -1037,9 +1037,8 @@
                           stopFM();
                       }
                       if (mSpeakerPhoneOn) {
-                          mSpeakerPhoneOn = false;
                           if (isAnalogModeSupported())
-                              setAudioPath(true);
+                              setAudioPath(false);
                       }
                       mStoppedOnFocusLoss = true;
                       break;