diff --git a/core/ContextBase.cpp b/core/ContextBase.cpp
index 12e550ff..084b6bfb 100644
--- a/core/ContextBase.cpp
+++ b/core/ContextBase.cpp
@@ -79,6 +79,7 @@ const loc_param_s_type ContextBase::mGps_conf_table[] =
   {"CONSTRAINED_TIME_UNCERTAINTY_ENERGY_BUDGET", &mGps_conf.CONSTRAINED_TIME_UNCERTAINTY_ENERGY_BUDGET, NULL, 'n'},
   {"POSITION_ASSISTED_CLOCK_ESTIMATOR_ENABLED",  &mGps_conf.POSITION_ASSISTED_CLOCK_ESTIMATOR_ENABLED, NULL, 'n'},
   {"PROXY_APP_PACKAGE_NAME",         &mGps_conf.PROXY_APP_PACKAGE_NAME,         NULL, 's' },
+  {"CP_MTLR_ES",                     &mGps_conf.CP_MTLR_ES,                     NULL, 'n' },
 };
 
 const loc_param_s_type ContextBase::mSap_conf_table[] =
@@ -112,7 +113,8 @@ void ContextBase::readConfig()
         mGps_conf.GPS_LOCK = GNSS_CONFIG_GPS_LOCK_MO_AND_NI;
         mGps_conf.SUPL_VER = 0x10000;
         mGps_conf.SUPL_MODE = 0x1;
-        mGps_conf.SUPL_ES = 1;
+        mGps_conf.SUPL_ES = 0;
+        mGps_conf.CP_MTLR_ES = 0;
         mGps_conf.SUPL_HOST[0] = 0;
         mGps_conf.SUPL_PORT = 0;
         mGps_conf.CAPABILITIES = 0x7;
diff --git a/core/ContextBase.h b/core/ContextBase.h
index 8fc2bd5f..ab61a084 100644
--- a/core/ContextBase.h
+++ b/core/ContextBase.h
@@ -72,6 +72,7 @@ typedef struct loc_gps_cfg_s
     uint32_t       CONSTRAINED_TIME_UNCERTAINTY_ENERGY_BUDGET;
     uint32_t       POSITION_ASSISTED_CLOCK_ESTIMATOR_ENABLED;
     char           PROXY_APP_PACKAGE_NAME[LOC_MAX_PARAM_STRING];
+    uint32_t       CP_MTLR_ES;
 } loc_gps_cfg_s_type;
 
 /* NOTE: the implementaiton of the parser casts number
diff --git a/etc/gps.conf b/etc/gps.conf
index 2ec3f69a..35a0a7e6 100644
--- a/etc/gps.conf
+++ b/etc/gps.conf
@@ -288,3 +288,9 @@ MODEM_TYPE = 1
 # This is a string that is sent to the framework
 # in nfwNotifyCb callback
 PROXY_APP_PACKAGE_NAME = com.google.android.carrierlocation
+
+#####################################
+# CP_MTLR_ES
+#####################################
+# CP MTLR ES, 1=enable, 0=disable
+CP_MTLR_ES=0
diff --git a/gnss/GnssAdapter.cpp b/gnss/GnssAdapter.cpp
index 31cd8869..a6d82bf4 100644
--- a/gnss/GnssAdapter.cpp
+++ b/gnss/GnssAdapter.cpp
@@ -3409,16 +3409,20 @@ GnssAdapter::requestNiNotifyEvent(const GnssNiNotification &notify, const void*
             mNotify(notify),
             mData(data) {}
         inline virtual void proc() const {
-            if (GNSS_NI_TYPE_EMERGENCY_SUPL == mNotify.type ||
-                GNSS_NI_TYPE_CONTROL_PLANE == mNotify.type) {
+            if (GNSS_NI_TYPE_EMERGENCY_SUPL == mNotify.type) {
                 if (mAdapter.getE911State() ||
-                    ((GNSS_CONFIG_SUPL_EMERGENCY_SERVICES_NO == ContextBase::mGps_conf.SUPL_ES) &&
-                     (GNSS_NI_TYPE_EMERGENCY_SUPL == mNotify.type))) {
+                    (GNSS_CONFIG_SUPL_EMERGENCY_SERVICES_NO == ContextBase::mGps_conf.SUPL_ES)) {
                     mApi.informNiResponse(GNSS_NI_RESPONSE_ACCEPT, mData);
-                }
-                else {
+                } else {
                     mApi.informNiResponse(GNSS_NI_RESPONSE_DENY, mData);
                 }
+            } else if (GNSS_NI_TYPE_CONTROL_PLANE == mNotify.type) {
+                if (mAdapter.getE911State() &&
+                    (1 == ContextBase::mGps_conf.CP_MTLR_ES)) {
+                    mApi.informNiResponse(GNSS_NI_RESPONSE_ACCEPT, mData);
+                } else {
+                    mAdapter.requestNiNotify(mNotify, mData);
+                }
             } else {
                 mAdapter.requestNiNotify(mNotify, mData);
             }