diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/common/Util.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/common/Util.java
index ed27d1a24da..14c344d6b29 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/common/Util.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/common/Util.java
@@ -60,8 +60,9 @@ public class Util {
         List<Application> applications = new ArrayList<>();
         Application application = null;
         int applicationId = -1;
+        boolean hasNext = rs.next();
 
-        while (rs.next()) {
+        while (hasNext) {
             if (applicationId != rs.getInt("APP_ID")) {
                 if (application != null) {
                     applications.add(application);
@@ -97,7 +98,8 @@ public class Util {
                     }
                 }
             }
-            if (rs.last()) {
+            hasNext = rs.next();
+            if (!hasNext) {
                 applications.add(application);
             }
         }