diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidFeatureManager.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidFeatureManager.java
index 31e980f9d5..ada8eb7d32 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidFeatureManager.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidFeatureManager.java
@@ -65,7 +65,7 @@ public class AndroidFeatureManager implements FeatureManager {
     @Override
     public boolean addFeatures(List<Feature> features) throws DeviceManagementException {
         List<MobileFeature> mobileFeatures = new ArrayList<MobileFeature>();
-        for (Feature feature:features) {
+        for (Feature feature : features) {
             mobileFeatures.add(MobileDeviceManagementUtil.convertToMobileFeature(feature));
         }
         try {
@@ -134,8 +134,11 @@ public class AndroidFeatureManager implements FeatureManager {
             List<Feature> supportedFeatures = getSupportedFeatures();
             List<Feature> existingFeatures = this.getFeatures();
             List<Feature> missingFeatures = MobileDeviceManagementUtil.
-                                                       getMissingFeatures(supportedFeatures, existingFeatures);
-            return this.addFeatures(missingFeatures);
+                                                           getMissingFeatures(supportedFeatures, existingFeatures);
+            if (missingFeatures.size() > 0) {
+                return this.addFeatures(missingFeatures);
+            }
+            return true;
         }
     }