diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/util/RequestValidationUtil.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/util/RequestValidationUtil.java
index 98871ee2b53..01d5f6bb92d 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/util/RequestValidationUtil.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/util/RequestValidationUtil.java
@@ -348,8 +348,12 @@ public class RequestValidationUtil {
                     return enrollmentNotifier.validate(features);
                 case Constants.IOS:
                     //todo
+                    features = new ArrayList<>();
+                    break;
                 case Constants.WINDOWS:
                     //todo
+                    features = new ArrayList<>();
+                    break;
                 default:
                     log.error("No policy validator found for device type  " + deviceType);
                     break;