diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/js/load-map.js b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/js/load-map.js
index 4a7361e27..10c4ec453 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/js/load-map.js
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/js/load-map.js
@@ -19,8 +19,11 @@
 var map;
 
 function loadLeafletMap() {
+   
     var deviceLocationID = "#device-location",
         locations = $(deviceLocationID).data("locations"),
+        location_lat = $(deviceLocationID).data("lat"),
+        location_long = $(deviceLocationID).data("long"),
         container = "device-location",
         zoomLevel = 13,
         tileSet = "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
@@ -46,6 +49,19 @@ function loadLeafletMap() {
 
         $("#map-error").hide();
         $("#device-location").show();
+    } else if (location_long && location_lat) {
+
+        map = L.map(container).setView([location_lat, location_long], zoomLevel);
+        L.tileLayer(tileSet, {attribution: attribution}).addTo(map);
+
+        var m = L.marker([location_lat, location_long], {"opacity": opacVal}).addTo(map).bindPopup("Your device is here");
+        m.on('mouseover', function (e) {
+            this.openPopup();
+        });
+        m.on('mouseout', function (e) {
+            this.closePopup();
+        });
+
     } else {
         $("#device-location").hide();
         $("#map-error").show();
@@ -56,4 +72,4 @@ $(document).ready(function () {
     $(".location_tab").on("click", function () {
         loadLeafletMap();
     });
-});
\ No newline at end of file
+});