diff --git a/package-lock.json b/package-lock.json
index 5c64213..6726d91 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
     "name": "@flipbyte/redux-datatable",
-    "version": "0.7.7",
+    "version": "0.7.8",
     "lockfileVersion": 1,
     "requires": true,
     "dependencies": {
diff --git a/package.json b/package.json
index e093dd7..45e0b93 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@flipbyte/redux-datatable",
-    "version": "0.7.7",
+    "version": "0.7.8",
     "description": "React-Redux data table",
     "main": "lib/index.js",
     "module": "es/index.js",
diff --git a/src/reducer.js b/src/reducer.js
index 4f2dd8a..e798e64 100644
--- a/src/reducer.js
+++ b/src/reducer.js
@@ -108,20 +108,20 @@ export default function reducer(state = {}, action) {
         [actions.SET_LIMIT]: () => {
             let maxPage = 1;
             if (payload.limit > 0) {
-                maxPage = (tableState.query.count / payload.limit) || 1
+                maxPage = Math.floor((tableState.query.count / payload.limit)) || 1;
             }
             const currentPage = tableState.query.page > maxPage ? maxPage : tableState.query.page;
             const offset = (currentPage - 1) * payload.limit;
 
             let page = 1;
             if (payload.limit > 0) {
-                page = (offset / payload.limit) + 1;
+                page = Math.floor((offset / payload.limit) + 1);
             }
             return stateUpdater({
                 isFetching: true,
                 query: {
                     limit: parseInt(payload.limit, 10),
-                    page,
+                    page: page <= 1 ? 1 : page,
                     offset
                 },
             })