diff --git a/src/js/client.js b/src/js/client.js
index 9442372c4..9d1599ebb 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -1414,9 +1414,10 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
                 if (error) return callback(error);
                 if (status !== 200) return callback(new ClientError(status, data));
 
-                if (data.users.length === 0) return callback(null, users);
-
                 users = users.concat(data.users);
+
+                if (data.users.length < perPage) return callback(null, users);
+
                 page++;
 
                 fetchMore();