diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/notification/mgt/dao/impl/AbstractNotificationDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/notification/mgt/dao/impl/AbstractNotificationDAOImpl.java
index abe94ea4b92..bf801775098 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/notification/mgt/dao/impl/AbstractNotificationDAOImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/notification/mgt/dao/impl/AbstractNotificationDAOImpl.java
@@ -75,8 +75,8 @@ public abstract class AbstractNotificationDAOImpl implements NotificationDAO {
         try {
             conn = NotificationManagementDAOFactory.getConnection();
             String sql =
-                    "SELECT NOTIFICATION_ID, OPERATION_ID, DESCRIPTION, STATUS, DEVICE_IDENTIFICATION, DEVICE_NAME, " +
-                    "DEVICE TYPE FROM DM_NOTIFICATION WHERE TENANT_ID = ? AND NOTIFICATION_ID = ?";
+                    "SELECT NOTIFICATION_ID, OPERATION_ID, DESCRIPTION, STATUS FROM DM_NOTIFICATION WHERE " +
+                    "TENANT_ID = ? AND NOTIFICATION_ID = ?";
             stmt = conn.prepareStatement(sql);
             stmt.setInt(1, tenantId);
             stmt.setInt(2, notificationId);
@@ -161,7 +161,7 @@ public abstract class AbstractNotificationDAOImpl implements NotificationDAO {
             rs = stmt.executeQuery();
             notifications = new ArrayList<>();
             while (rs.next()) {
-                notifications.add(NotificationDAOUtil.getNotification(rs));
+                notifications.add(NotificationDAOUtil.getNotificationWithDeviceInfo(rs));
             }
         } catch (SQLException e) {
             throw new NotificationManagementException(
@@ -234,7 +234,7 @@ public abstract class AbstractNotificationDAOImpl implements NotificationDAO {
             rs = stmt.executeQuery();
             notifications = new ArrayList<>();
             while (rs.next()) {
-                notifications.add(NotificationDAOUtil.getNotification(rs));
+                notifications.add(NotificationDAOUtil.getNotificationWithDeviceInfo(rs));
             }
         } catch (SQLException e) {
             throw new NotificationManagementException(
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/notification/mgt/dao/util/NotificationDAOUtil.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/notification/mgt/dao/util/NotificationDAOUtil.java
index abfddf13ee9..68519f07424 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/notification/mgt/dao/util/NotificationDAOUtil.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/notification/mgt/dao/util/NotificationDAOUtil.java
@@ -126,6 +126,15 @@ public class NotificationDAOUtil {
 	}
 
 	public static Notification getNotification(ResultSet rs) throws SQLException {
+		Notification notification = new Notification();
+		notification.setNotificationId(rs.getInt("NOTIFICATION_ID"));
+		notification.setOperationId(rs.getInt("OPERATION_ID"));
+		notification.setDescription(rs.getString("DESCRIPTION"));
+		notification.setStatus(rs.getString("STATUS"));
+		return notification;
+	}
+
+	public static Notification getNotificationWithDeviceInfo(ResultSet rs) throws SQLException {
 		Notification notification = new Notification();
 		notification.setNotificationId(rs.getInt("NOTIFICATION_ID"));
 		notification.setOperationId(rs.getInt("OPERATION_ID"));