diff --git a/client/client/src/addresses/addresses.html b/client/client/src/addresses/addresses.html
index c79d56ff7f..8b70502229 100644
--- a/client/client/src/addresses/addresses.html
+++ b/client/client/src/addresses/addresses.html
@@ -5,7 +5,7 @@
             <vn-horizontal>
                 <vn-title vn-one>Addresses</vn-title>
             </vn-horizontal>
-            <vn-horizontal ng-repeat="i in index.model track by i.id" class="pad-medium-top" style="align-items: center;">
+            <vn-horizontal ng-repeat="i in index.model.items track by i.id" class="pad-medium-top" style="align-items: center;">
                 <vn-one border-radius class="pad-small border-solid"
                     ng-class="{'bg-dark-item': i.isDefaultAddress,'bg-opacity-item': !i.isEnabled && !i.isDefaultAddress}">
                     <vn-horizontal style="align-items: center;">
@@ -27,7 +27,9 @@
             </vn-horizontal>
         </vn-vertical>
     </vn-card>
-    <vn-paging index="index"></vn-paging>
+    
+    <vn-paging index="index" total="index.model.total"></vn-paging>
+    
     <vn-float-button
         fixed-bottom-right
         ui-sref="clientCard.addresses.create"
diff --git a/services/client/common/methods/client/addresses.js b/services/client/common/methods/client/addresses.js
index 247c9aec0c..cf11a525b8 100644
--- a/services/client/common/methods/client/addresses.js
+++ b/services/client/common/methods/client/addresses.js
@@ -41,10 +41,32 @@ module.exports = function(Client) {
             order: ['isDefaultAddress DESC', 'isEnabled DESC']
         };
 
+        let total = null;
+        let items = null;
+
+        function response(type, value) {
+            if (type === 'total') {
+                total = value;
+            } else {
+                items = value;
+            }
+
+            if (total !== null && items !== null) {
+                callback(null, {total: total, items: items});
+            }
+        }
+
         Client.app.models.Address.find(filter, function(err, instances) {
             if (err)
                 return callback(err, null);
-            callback(null, instances);
+            response('find', instances);
+        });
+
+        Client.app.models.Address.count(filter.where, function(err, total) {
+            if (err)
+                return callback(err, null);
+            response('total', total);
         });
     };
+
 };