diff --git a/gps/utils/loc_cfg.cpp b/gps/utils/loc_cfg.cpp
index bb09ed4..0742dfc 100644
--- a/gps/utils/loc_cfg.cpp
+++ b/gps/utils/loc_cfg.cpp
@@ -94,6 +94,12 @@ const char LOC_PATH_SLIM_CONF[] = LOC_PATH_SLIM_CONF_STR;
 const char LOC_PATH_VPE_CONF[] = LOC_PATH_VPE_CONF_STR;
 const char LOC_PATH_QPPE_CONF[] = LOC_PATH_QPPE_CONF_STR;
 
+bool isXtraDaemonEnabled() {
+    bool enabled = property_get_bool("persist.sys.xtra-daemon.enabled", false);
+    LOC_LOGe("xtra-daemon enabled: %d\n", enabled);
+    return enabled;
+}
+
 bool isVendorEnhanced() {
     return sVendorEnhanced;
 }
@@ -818,6 +824,13 @@ int loc_read_process_conf(const char* conf_file_name, uint32_t * process_count_p
             continue;
         }
 
+        if (strcmp(conf.proc_name, "xtra-daemon") == 0 && !isXtraDaemonEnabled()) {
+            LOC_LOGE("%s:%d]: Process xtra-daemon is disabled via property",
+                     __func__, __LINE__);
+            child_proc[j].proc_status = DISABLED_FROM_CONF;
+            continue;
+        }
+
         if (!isVendorEnhanced() && (conf.vendor_enhanced_process != 0)) {
             LOC_LOGD("%s:%d]: Process %s is disabled via vendor enhanced process check",
                      __func__, __LINE__, conf.proc_name);
diff --git a/rootdir/etc/init.sky.rc b/rootdir/etc/init.sky.rc
index a914848..c24b753 100644
--- a/rootdir/etc/init.sky.rc
+++ b/rootdir/etc/init.sky.rc
@@ -74,3 +74,6 @@ on property:vendor.fps_hal.restartimes=max
 
 on property:sys.boot_completed=1
     write /sys/class/thermal/thermal_message/sconfig 500
+
+on property:persist.sys.xtra-daemon.enabled=*
+    restart loc_launcher