diff --git a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
index 272d3f23..f3aa3455 100644
--- a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
+++ b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
@@ -293,6 +293,6 @@ public class GepafinConstant {
     public static final String APPLICATION_DOCUMENTS_NOT_FOUND_MSG = "application.documents.not.found";
     public static final String DUPLICATE_BENEFICIARY_CALL = "beneficiary.call.duplicate";
     public static final String COMPANY_ID_REQUIRED_FOR_PREFERRED_CALL = "company.id.required.for.preferred.call";
-    public static final String CREATED_DATE = "createdDate";
+    public static final String SUBMISSION_DATE = "submissionDate";
 }
 
diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
index 58f41f7c..90328086 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
@@ -337,8 +337,11 @@ public class ApplicationDao {
                         .collect(Collectors.toList());
                 predicate = builder.and(predicate, root.get("status").in(statusNames));
             }
-            predicate = builder.and(predicate, builder.equal(root.get("hubId"), userEntity.getHub().getId()));
-            query.orderBy(builder.desc(root.get(GepafinConstant.CREATED_DATE)));
+            query.orderBy(
+                    builder.desc(builder.isNotNull(root.get(GepafinConstant.SUBMISSION_DATE))),
+                    builder.desc(root.get(GepafinConstant.SUBMISSION_DATE))
+            );
+
             return predicate;
 		};
 	}