diff --git a/config/rhodeautoconf.h b/config/rhodeautoconf.h
index d1de799450f8..f0193a3f0288 100644
--- a/config/rhodeautoconf.h
+++ b/config/rhodeautoconf.h
@@ -3,3 +3,4 @@
  */
 #define CONFIG_AW882XX_STEREO_SMARTPA 1
 #define CONFIG_MBHC_DISABLE_MOISTURE_DETECT 1
+#define CONFIG_AW882XX_PARAMS_STORED_IN_BIN 1
diff --git a/dsp/Kbuild b/dsp/Kbuild
index dd3c886ec647..41f6d4951b9d 100644
--- a/dsp/Kbuild
+++ b/dsp/Kbuild
@@ -96,6 +96,9 @@ ifeq ($(KERNEL_BUILD), 0)
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/sdm450autoconf.h
 	endif
+	ifneq (,$(filter rhode%, $(TARGET_PRODUCT)))
+		INCS    +=  -include $(AUDIO_ROOT)/config/rhodeautoconf.h
+	endif
 endif
 
 
diff --git a/dsp/q6afe.c b/dsp/q6afe.c
index 7bee21008db5..ca381c51c5e1 100644
--- a/dsp/q6afe.c
+++ b/dsp/q6afe.c
@@ -11031,6 +11031,9 @@ static int afe_unmap_cal_data(int32_t cal_type,
 	ret = afe_cmd_memory_unmap_nowait(
 		cal_block->map_data.q6map_handle);
 	atomic_set(&this_afe.mem_map_cal_index, -1);
+#ifdef CONFIG_AW882XX_PARAMS_STORED_IN_BIN
+	atomic_set(&this_afe.mem_map_cal_handles[cal_index],0);
+#endif
 	if (ret < 0) {
 		pr_err("%s: unmap did not work! cal_type %i ret %d\n",
 			__func__, cal_index, ret);