diff --git a/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/controller/AppRegistryController.java b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/controller/AppRegistryController.java
index e238e4b468..9f1242695c 100644
--- a/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/controller/AppRegistryController.java
+++ b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/controller/AppRegistryController.java
@@ -118,7 +118,7 @@ public PagedResources<? extends AppRegistrationResource> list(
 		}
 		Collections.sort(list);
 		return pagedResourcesAssembler
-				.toResource(new PageImpl<>(list, pageable, appRegistry.findAll().size()), assembler);
+				.toResource(new PageImpl<>(list, pageable, list.size()), assembler);
 	}
 
 	/**