diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/exception/BadRequestException.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/exception/BadRequestException.java
index 0be9790e3a..0c6b68217d 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/exception/BadRequestException.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/exception/BadRequestException.java
@@ -36,7 +36,7 @@ public class BadRequestException extends WebApplicationException {
     }
 
     public BadRequestException(ErrorDTO errorDTO) {
-        super(Response.status(Response.Status.INTERNAL_SERVER_ERROR)
+        super(Response.status(Response.Status.BAD_REQUEST)
                       .entity(errorDTO)
                       .header(Constants.DeviceConstants.HEADER_CONTENT_TYPE, Constants.DeviceConstants.APPLICATION_JSON)
                       .build());
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/AnalyticsArtifactsManagementServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/AnalyticsArtifactsManagementServiceImpl.java
index 1ca322f442..bdd7fdb420 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/AnalyticsArtifactsManagementServiceImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/AnalyticsArtifactsManagementServiceImpl.java
@@ -121,7 +121,7 @@ public class AnalyticsArtifactsManagementServiceImpl
         } catch (BadRequestException e) {
             String errMsg = "Failed to deploy stream due to invalid payload";
             log.error(errMsg, e);
-            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(errMsg).build();
+            return Response.status(Response.Status.BAD_REQUEST).entity(errMsg).build();
         } catch (AxisFault e) {
             String errMsg = "Failed to create event definitions for tenant " + tenantDomain;
             log.error(errMsg, e);
@@ -194,7 +194,7 @@ public class AnalyticsArtifactsManagementServiceImpl
         } catch (BadRequestException e) {
             String errMsg = "Failed to deploy receiver due to invalid payload";
             log.error(errMsg, e);
-            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(errMsg).build();
+            return Response.status(Response.Status.BAD_REQUEST).entity(errMsg).build();
         } catch (AxisFault e) {
             String errMsg = "Failed to create event definitions for tenantDomain: " + tenantDomain;
             log.error(errMsg, e);
@@ -267,7 +267,7 @@ public class AnalyticsArtifactsManagementServiceImpl
         } catch (BadRequestException e) {
             String errMsg = "Failed to deploy publisher due to invalid payload";
             log.error(errMsg, e);
-            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(errMsg).build();
+            return Response.status(Response.Status.BAD_REQUEST).entity(errMsg).build();
         } catch (AxisFault e) {
             String errMsg = "Failed to create event definitions for tenantDomain: " + tenantDomain;
             log.error(errMsg, e);
@@ -300,7 +300,7 @@ public class AnalyticsArtifactsManagementServiceImpl
         } catch (InvalidExecutionPlanException e) {
             String errMsg = "Failed to deploy siddhi script due to invalid payload";
             log.error(errMsg, e);
-            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(errMsg).build();
+            return Response.status(Response.Status.BAD_REQUEST).entity(errMsg).build();
         } catch (AxisFault e) {
             String errMsg = "Failed to create event definitions for tenantDomain: " + tenantDomain;
             log.error(errMsg, e);