diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dto/operation/mgt/Operation.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dto/operation/mgt/Operation.java
index 1b34b5d02b7..cf8645cc420 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dto/operation/mgt/Operation.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dto/operation/mgt/Operation.java
@@ -23,7 +23,9 @@ import java.util.Properties;
 
 public class Operation implements Serializable {
 
-	public enum Type {
+    private static final long serialVersionUID = -353614864628915060L;
+
+    public enum Type {
 		CONFIG, MESSAGE, INFO, COMMAND, PROFILE , POLICY
 	}
 
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 0e5306f6c24..2ac5150a59d 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
@@ -251,7 +251,7 @@ public class OperationManagerImpl implements OperationManager {
                 }
                 OperationManagementDAOFactory.commitTransaction();
 
-                if (isScheduled) {
+                if (!isScheduled) {
                     for (Device device : authorizedDevices) {
                         this.sendNotification(operation, device);
                     }