diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java
index 3a9db4f4c0..a6bc22a46d 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java
@@ -237,6 +237,7 @@ public class OperationManagerImpl implements OperationManager {
                 }
 
                 int operationId = this.lookupOperationDAO(operation).addOperation(operationDto);
+                operation.setId(operationId);
 
                 boolean isScheduled = false;
                 NotificationStrategy notificationStrategy = getNotificationStrategy();