diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/impl/DeviceManagementAdminServiceImpl.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/impl/DeviceManagementAdminServiceImpl.java
index c383304a5..8442d44c7 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/impl/DeviceManagementAdminServiceImpl.java
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/impl/DeviceManagementAdminServiceImpl.java
@@ -558,6 +558,22 @@ public class DeviceManagementAdminServiceImpl implements DeviceManagementAdminSe
                     throw new BadRequestException(
                             new ErrorResponse.ErrorResponseBuilder().setCode(400l).setMessage(errorMessage).build());
                 }
+                if (payload.has("type")) {
+                    String type = payload.getString("type");
+                    if (!"enterprise".equalsIgnoreCase(type)
+                        && !"public".equalsIgnoreCase(type)
+                        && !"webapp".equalsIgnoreCase(type)) {
+                        String errorMessage = "Invalid application type.";
+                        log.error(errorMessage);
+                        throw new BadRequestException(
+                                new ErrorResponse.ErrorResponseBuilder().setCode(400l).setMessage(errorMessage).build());
+                    }
+                } else {
+                    String errorMessage = "Application type is missing.";
+                    log.error(errorMessage);
+                    throw new BadRequestException(
+                            new ErrorResponse.ErrorResponseBuilder().setCode(400l).setMessage(errorMessage).build());
+                }
             } catch (MalformedURLException e) {
                 String errorMessage = "Malformed application url.";
                 log.error(errorMessage);