diff --git a/client/web/compose/src/components/PageBlocks/RecordListBase.vue b/client/web/compose/src/components/PageBlocks/RecordListBase.vue
index aac917074..ab1bda655 100644
--- a/client/web/compose/src/components/PageBlocks/RecordListBase.vue
+++ b/client/web/compose/src/components/PageBlocks/RecordListBase.vue
@@ -517,7 +517,7 @@
               </div>
             </div>
             <div
-              v-if="showPageNavigation && !options.hidePaging && !inlineEditing"
+              v-if="!options.hidePaging && !inlineEditing"
             >
               <b-pagination
                 v-if="options.fullPageNavigation"
@@ -715,7 +715,7 @@ export default {
 
       return {
         from: ((page - 1) * perPage) + 1,
-        to: Math.min((page * perPage), count),
+        to: perPage > 0 ? Math.min((page * perPage), count) : count,
         page,
         perPage,
         count,
@@ -730,10 +730,6 @@ export default {
       return this.filter.nextPage
     },
 
-    showPageNavigation () {
-      return this.hasNextPage || this.hasPrevPage
-    },
-
     editing () {
       return this.mode === 'editor'
     },