diff --git a/drivers/scsi/ufs/ufs-qcom.c b/drivers/scsi/ufs/ufs-qcom.c
index ff4f067edc1d..9e42ec1e967d 100644
--- a/drivers/scsi/ufs/ufs-qcom.c
+++ b/drivers/scsi/ufs/ufs-qcom.c
@@ -2057,12 +2057,11 @@ __setup("androidboot.bootdevice=", get_android_boot_dev);
  */
 static void ufs_qcom_parse_lpm(struct ufs_qcom_host *host)
 {
-#if IS_ENABLED(CONFIG_BOARD_UMI) || IS_ENABLED(CONFIG_BOARD_THYME)
-	host->disable_lpm = false;
-#else
+#ifdef CONFIG_FACTORY_BUILD
 	struct device_node *node = host->hba->dev->of_node;
-
 	host->disable_lpm = of_property_read_bool(node, "qcom,disable-lpm");
+#else
+	host->disable_lpm = false;
 #endif
 	if (host->disable_lpm)
 		pr_info("%s: will disable all LPM modes\n", __func__);