diff --git a/arch/arm64/configs/vendor/lahaina_QGKI.config b/arch/arm64/configs/vendor/lahaina_QGKI.config
index 5040c8af5091..b1191dbea9de 100644
--- a/arch/arm64/configs/vendor/lahaina_QGKI.config
+++ b/arch/arm64/configs/vendor/lahaina_QGKI.config
@@ -88,6 +88,7 @@ CONFIG_CLD_LL_CORE=y
 CONFIG_CORESIGHT_QGKI=y
 CONFIG_CORESIGHT_LINK_AND_SINK_TMC=y
 CONFIG_CORESIGHT_CTI=y
+CONFIG_CORESIGHT_CTI_SAVE_DISABLE=y
 CONFIG_CORESIGHT_TPDA=y
 CONFIG_CORESIGHT_TPDM=y
 CONFIG_CORESIGHT_HWEVENT=y
@@ -97,7 +98,6 @@ CONFIG_CORESIGHT_TGU=y
 CONFIG_AUDIO_QGKI=y
 CONFIG_QCOM_FSA4480_I2C=y
 # CONFIG_CORESIGHT_CATU is not set
-# CONFIG_CORESIGHT_CTI_SAVE_DISABLE is not set
 # CONFIG_CORESIGHT_TPDM_DEFAULT_ENABLE is not set
 CONFIG_BTFM_SLIM=m
 # CONFIG_SND_SOC_WCD9335 is not set
diff --git a/arch/arm64/configs/vendor/lahaina_debug.config b/arch/arm64/configs/vendor/lahaina_debug.config
index 96e0a96afeeb..22b47c1710d0 100644
--- a/arch/arm64/configs/vendor/lahaina_debug.config
+++ b/arch/arm64/configs/vendor/lahaina_debug.config
@@ -53,6 +53,7 @@ CONFIG_I3C_MASTER_MSM_GENI=y
 # CONFIG_CDNS_I3C_MASTER is not set
 # CONFIG_DW_I3C_MASTER is not set
 CONFIG_CORESIGHT_SOURCE_ETM4X=y
+# CONFIG_CORESIGHT_CTI_SAVE_DISABLE is not set
 CONFIG_MHI_BUS=y
 CONFIG_MHI_DEBUG=y
 CONFIG_MHI_UCI=y