diff --git a/fmapp2/src/com/caf/fmradio/FMRadio.java b/fmapp2/src/com/caf/fmradio/FMRadio.java
index fb5ca1a8d5f356dfa2ea1e83e25053ef851c1ac2..34b3d236b20a03984445ac6ebebb265e702c98e7 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadio.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadio.java
@@ -2250,7 +2250,7 @@ public class FMRadio extends Activity
    }
 
    private void A2DPConnectionState(boolean state) {
-      Log.d(LOGTAG, "A2DPConnectionState with:" +state);
+      Log.d(LOGTAG, "A2DPConnectionState with: " + state);
       if (state) {
           Log.d(LOGTAG, "A2DP connected, set button to speaker");
           mSpeakerButton.setImageResource(R.drawable.btn_speaker);
diff --git a/fmapp2/src/com/caf/fmradio/FMRadioService.java b/fmapp2/src/com/caf/fmradio/FMRadioService.java
index 7dcc261e6fd5057432ac3d10ef98eef4713a5342..86f2b6366d2529806723d925023639dc5587e391 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadioService.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadioService.java
@@ -1059,7 +1059,12 @@ public class FMRadioService extends Service
                Log.d(LOGTAG, "Audio source set it as headset");
                AudioSystem.setForceUse(AudioSystem.FOR_MEDIA, AudioSystem.FORCE_NONE);
            }
+       } else {
+               Log.d(LOGTAG, "A2DP is connected, set audio source to A2DP HS");
+               AudioSystem.setForceUse(AudioSystem.FOR_MEDIA, AudioSystem.FORCE_SPEAKER);
+               mSpeakerPhoneOn = true;
        }
+
        mPlaybackInProgress = true;
        configureAudioDataPath(true);
        try {