diff --git a/packages/core-api/CHANGELOG.md b/packages/core-api/CHANGELOG.md
index dbda7c7eae..998f356546 100644
--- a/packages/core-api/CHANGELOG.md
+++ b/packages/core-api/CHANGELOG.md
@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## Unreleased
 
+### Fixed
+- Return the correct total count for `/api/v2/peers`
+
 ## 0.2.0 - 2018-12-03
 
 ### Added
diff --git a/packages/core-api/lib/versions/2/handlers/peers.js b/packages/core-api/lib/versions/2/handlers/peers.js
index 24afd2cf0e..c1039f8ffc 100644
--- a/packages/core-api/lib/versions/2/handlers/peers.js
+++ b/packages/core-api/lib/versions/2/handlers/peers.js
@@ -44,7 +44,7 @@ exports.index = {
 
     return utils.toPagination(
       request,
-      { rows: result, count: result.length },
+      { rows: result, count: allPeers.length },
       'peer',
     )
   },