diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/impl/GenericOperationDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/impl/GenericOperationDAOImpl.java
index caa4de580a..7094afdcd3 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/impl/GenericOperationDAOImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/impl/GenericOperationDAOImpl.java
@@ -376,9 +376,8 @@ public class GenericOperationDAOImpl implements OperationDAO {
                         for (Map.Entry<String, List<OperationResponse>> deviceOpRes : deviceOpResponseMap.entrySet()) {
                             for (ActivityStatus status : activityStatuses) {
                                 if (deviceOpRes.getKey().equalsIgnoreCase(status.getDeviceIdentifier().getId())) {
-                                    if(status.getResponses()==null){
-                                        List<OperationResponse> responses = new ArrayList<>();
-                                        status.setResponses(responses);
+                                    if (status.getResponses() == null) {
+                                        status.setResponses(new ArrayList<>());
                                     }
                                     status.getResponses().addAll(deviceOpRes.getValue());
                                 }