diff --git a/src/componentMethods.js b/src/componentMethods.js
index 5d6b98c..f52a1b6 100644
--- a/src/componentMethods.js
+++ b/src/componentMethods.js
@@ -10,7 +10,9 @@ export default {
       pivotValKey,
       subRowsKey,
       expanderColumnWidth,
-      SubComponent
+      SubComponent,
+      page,
+      pageSize
     } = this.getResolvedState(nextProps, nextState)
 
     // Determine Header Groups
@@ -212,13 +214,16 @@ export default {
       resolvedData = groupRecursively(resolvedData, pivotBy)
     }
 
+    const newPages = Math.ceil(resolvedData.length / pageSize)
+
     return {
       resolvedData,
       pivotColumn,
       allVisibleColumns,
       headerGroups,
       allDecoratedColumns,
-      hasHeaderGroups
+      hasHeaderGroups,
+      page: (page + 1) > newPages ? newPages - 1 : page
     }
   },
   getSortedData (state) {