diff --git a/configs/default_defconfig b/configs/default_defconfig
index a9061eb8c927..e2fe01dc937c 100644
--- a/configs/default_defconfig
+++ b/configs/default_defconfig
@@ -16,7 +16,9 @@ ifeq ($(CONFIG_CNSS_QCA6390), y)
 	CONFIG_LITHIUM := y
 	CONFIG_WLAN_FEATURE_11AX := y
 	CONFIG_WLAN_FEATURE_DFS_OFFLOAD := y
-	CONFIG_IPA3 := n
+	ifeq ($(CONFIG_ARCH_SDM845), y)
+		CONFIG_IPA3 := n
+	endif
 	CONFIG_SCALE_INCLUDES := y
 	CONFIG_HASTINGS_BT_WAR := y
 endif
@@ -524,9 +526,11 @@ endif
 
 ifeq ($(CONFIG_ARCH_SM8150), y)
 ifeq ($(CONFIG_IPA_OFFLOAD), y)
+ifneq ($(CONFIG_LITHIUM), y)
 CONFIG_ENABLE_SMMU_S1_TRANSLATION := y
 endif
 endif
+endif
 
 ifeq ($(CONFIG_ARCH_SDX20), y)
 ifeq ($(CONFIG_QCA_WIFI_SDIO), y)