diff --git a/config/BoardConfigQcom.mk b/config/BoardConfigQcom.mk
index ab01fae..f806a51 100644
--- a/config/BoardConfigQcom.mk
+++ b/config/BoardConfigQcom.mk
@@ -12,7 +12,7 @@
 B_FAMILY := msm8226 msm8610 msm8974
 B64_FAMILY := msm8992 msm8994
 BR_FAMILY := msm8909 msm8916
-UM_3_18_FAMILY := msm8937 msm8953 msm8996
+UM_3_18_FAMILY := msm8937 msm8996
 UM_4_4_FAMILY := msm8998 sdm660
 UM_4_9_FAMILY := sdm845 sdm710
 UM_4_14_FAMILY := $(MSMNILE) $(MSMSTEPPE) $(TRINKET) $(ATOLL)
@@ -25,6 +25,12 @@
     QSSI_SUPPORTED_PLATFORMS += $(TARGET_BOARD_PLATFORM)
 endif
 
+ifeq (,$(TARGET_ENFORCES_QSSI))
+UM_3_18_FAMILY += msm8953
+else
+QSSI_SUPPORTED_PLATFORMS += msm8953
+endif
+
 BOARD_USES_ADRENO := true
 
 # Add qtidisplay to soong config namespaces