diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 1bd3421..1fee1d3 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -1324,6 +1324,13 @@
          *       Because select_devices() must be called to switch back the music
          *       playback to headset.
          */
+        if ((adev->mode == AUDIO_MODE_NORMAL) &&
+                voice_is_in_call(adev) &&
+                output_drives_call(adev, out)) {
+            ret = voice_stop_call(adev);
+            adev->current_call_output = NULL;
+        }
+
         if (val != 0) {
             out->devices = val;
 
@@ -1344,13 +1351,6 @@
             }
         }
 
-        if ((adev->mode == AUDIO_MODE_NORMAL) &&
-                voice_is_in_call(adev) &&
-                output_drives_call(adev, out)) {
-            ret = voice_stop_call(adev);
-            adev->current_call_output = NULL;
-        }
-
         pthread_mutex_unlock(&adev->lock);
         pthread_mutex_unlock(&out->lock);
     }