diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 2a12341d302466c5b62340bba0b23a490c6af5fa..f66cb06a64a99e3049884a98f6e7d7923a0cfd0d 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -643,9 +643,9 @@ static const char * const device_table[SND_DEVICE_MAX] = {
 
     /* Capture sound devices */
     [SND_DEVICE_IN_HANDSET_MIC] = "handset-mic",
-    [SND_DEVICE_IN_HANDSET_MIC_SB] = "handset-mic",
-    [SND_DEVICE_IN_HANDSET_MIC_NN] = "handset-mic",
-    [SND_DEVICE_IN_HANDSET_MIC_EXTERNAL] = "handset-mic-ext",
+    [SND_DEVICE_IN_HANDSET_MIC_SB] = "handset-mic2",
+    [SND_DEVICE_IN_HANDSET_MIC_NN] = "handset-mic3",
+    [SND_DEVICE_IN_HANDSET_MIC_EXTERNAL] = "handset-mic4",
     [SND_DEVICE_IN_HANDSET_MIC_AEC] = "handset-mic",
     [SND_DEVICE_IN_HANDSET_MIC_AEC_SB] = "handset-mic",
     [SND_DEVICE_IN_HANDSET_MIC_AEC_NN] = "handset-mic",
@@ -945,8 +945,8 @@ static int acdb_device_table[SND_DEVICE_MAX] = {
     [SND_DEVICE_OUT_BUS_RSE] = 60,
     [SND_DEVICE_OUT_CALL_PROXY] = 32,
     [SND_DEVICE_IN_HANDSET_MIC] = 4,
-    [SND_DEVICE_IN_HANDSET_MIC_SB] = 163,
-    [SND_DEVICE_IN_HANDSET_MIC_NN] = 183,
+    [SND_DEVICE_IN_HANDSET_MIC_SB] = 4,
+    [SND_DEVICE_IN_HANDSET_MIC_NN] = 4,
     [SND_DEVICE_IN_HANDSET_MIC_EXTERNAL] = 4,
     [SND_DEVICE_IN_HANDSET_MIC_AEC] = 106,
     [SND_DEVICE_IN_HANDSET_MIC_AEC_SB] = 164,
@@ -7118,10 +7118,7 @@ snd_device_t platform_get_input_snd_device(void *platform,
                 } else if (is_operator_tmus())
                     snd_device = SND_DEVICE_IN_VOICE_DMIC_TMUS;
                 else { /* for FLUENCE_DUAL_MIC and SOURCE_DUAL_MIC */
-                    snd_device = my_data->fluence_sb_enabled ?
-                                     SND_DEVICE_IN_VOICE_DMIC_SB
-                                     : SND_DEVICE_IN_VOICE_DMIC;
-                    adev->acdb_settings |= DMIC_FLAG;
+                    snd_device = SND_DEVICE_IN_HANDSET_MIC;
                 }
             }
         } else if (compare_device_type(out_devices, AUDIO_DEVICE_OUT_WIRED_HEADSET)) {
@@ -7173,13 +7170,11 @@ snd_device_t platform_get_input_snd_device(void *platform,
                     adev->acdb_settings |= TMIC_FLAG;
                     snd_device = SND_DEVICE_IN_VOICE_SPEAKER_TMIC;
                 } else {
-                    adev->acdb_settings |= DMIC_FLAG;
-                    if (my_data->fluence_mode == FLUENCE_BROADSIDE)
+                    if (my_data->fluence_mode == FLUENCE_BROADSIDE) {
+                       adev->acdb_settings |= DMIC_FLAG;
                        snd_device = SND_DEVICE_IN_VOICE_SPEAKER_DMIC_BROADSIDE;
-                    else
-                       snd_device = my_data->fluence_sb_enabled ?
-                                        SND_DEVICE_IN_VOICE_SPEAKER_DMIC_SB
-                                        : SND_DEVICE_IN_VOICE_SPEAKER_DMIC;
+		    } else
+			snd_device = SND_DEVICE_IN_VOICE_SPEAKER_MIC;
                 }
                 if (audio_extn_hfp_is_active(adev))
                     platform_set_echo_reference(adev, true, out_devices);