diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/MDMAndroidOperationUtil.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/MDMAndroidOperationUtil.java
index a276aaff985..cce871d0097 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/MDMAndroidOperationUtil.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/MDMAndroidOperationUtil.java
@@ -50,9 +50,7 @@ public class MDMAndroidOperationUtil {
 			case ENTERPRISE:
 				EnterpriseApplication enterpriseApplication = new EnterpriseApplication();
 				enterpriseApplication.setType(application.getType().toString());
-				//TODO: replace needs to be removed after doing the proper config update in application-mgt.xml
-				enterpriseApplication.setUrl(application.getLocation().replace("https://localhost:9443",
-				                                                               "http://192.168.8.6:9763"));
+				enterpriseApplication.setUrl(application.getLocation());
 				operation.setPayLoad(enterpriseApplication.toJSON());
 				break;
 			case PUBLIC: