diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceEventManagementService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceEventManagementService.java
index 26904a9cdf..c49f9698c1 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceEventManagementService.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceEventManagementService.java
@@ -123,6 +123,7 @@ public interface DeviceEventManagementService {
     Response deployDeviceTypeEventDefinition(@ApiParam(name = "type", value = "The device type, such as android, ios," +
             " and windows.", required = false)
                                              @PathParam("type")String deviceType,
+                                             @QueryParam("skipPersist")boolean skipPersist,
                                              @ApiParam(name = "deviceTypeEvent", value = "Add the data to complete " +
                                                      "the  DeviceTypeEvent object.", required = true)
                                              @Valid DeviceTypeEvent deviceTypeEvent);
@@ -357,7 +358,7 @@ public interface DeviceEventManagementService {
             @QueryParam("max") double max
     );
 
-  
+
     @GET
     @Path("/{type}")
     @ApiOperation(
@@ -411,4 +412,4 @@ public interface DeviceEventManagementService {
             " ios, or windows.", required = false)
                                           @PathParam("type")String deviceType) ;
 
-}
\ No newline at end of file
+}
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceEventManagementServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceEventManagementServiceImpl.java
index 2bbcee2d43..e6fe0e4f8c 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceEventManagementServiceImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceEventManagementServiceImpl.java
@@ -192,6 +192,7 @@ public class DeviceEventManagementServiceImpl implements DeviceEventManagementSe
     @Path("/{type}")
     @Override
     public Response deployDeviceTypeEventDefinition(@PathParam("type") String deviceType,
+                                                    @QueryParam("skipPersist") boolean skipPersist,
                                                     @Valid DeviceTypeEvent deviceTypeEvent) {
         TransportType transportType = deviceTypeEvent.getTransportType();
         EventAttributeList eventAttributes = deviceTypeEvent.getEventAttributeList();
@@ -208,7 +209,9 @@ public class DeviceEventManagementServiceImpl implements DeviceEventManagementSe
             String streamNameWithVersion = streamName + ":" + Constants.DEFAULT_STREAM_VERSION;
             publishStreamDefinitons(streamName, Constants.DEFAULT_STREAM_VERSION, deviceType, eventAttributes);
             publishEventReceivers(streamNameWithVersion, transportType, tenantDomain, deviceType);
-            publishEventStore(streamName, Constants.DEFAULT_STREAM_VERSION, eventAttributes);
+            if (!skipPersist) {
+                publishEventStore(streamName, Constants.DEFAULT_STREAM_VERSION, eventAttributes);
+            }
             publishWebsocketPublisherDefinition(streamNameWithVersion, deviceType);
             try {
                 PrivilegedCarbonContext.startTenantFlow();