diff --git a/CHANGELOG.md b/CHANGELOG.md
index fdb870513..628299e9f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+### Fixed
+- [#907](https://github.com/plotly/dash-table/pull/907) 
+  - Fix a bug where pagination did not work or was not visible. [#834](https://github.com/plotly/dash-table/issues/834)
+  - Fix a bug where if you are on a page that no longer exists after the data is updated, no data is displayed. [#892](https://github.com/plotly/dash-table/issues/892)
+
+
 ### Added
 - [#545](https://github.com/plotly/dash-table/issues/545)
     - Case insensitive filtering
diff --git a/src/dash-table/components/Table/Table.less b/src/dash-table/components/Table/Table.less
index 471e4f8ac..4118a020a 100644
--- a/src/dash-table/components/Table/Table.less
+++ b/src/dash-table/components/Table/Table.less
@@ -143,7 +143,7 @@
 
 .dash-table-container {
     .previous-next-container {
-        float: right;
+        text-align: right;
         padding: 5px 0px;
 
         .page-number {
diff --git a/src/dash-table/derived/paginator.ts b/src/dash-table/derived/paginator.ts
index 98b134bc4..84ca9b556 100644
--- a/src/dash-table/derived/paginator.ts
+++ b/src/dash-table/derived/paginator.ts
@@ -50,6 +50,11 @@ function makePaginator(params: IPaginatorParams | null): IPaginator {
     const {setProps, page_count} = params;
     let {page_current} = params;
 
+    if (page_count && page_count - 1 < page_current) {
+        page_current = 0;
+        updatePage();
+    }
+
     function updatePage() {
         setProps({
             page_current,
diff --git a/tests/selenium/test_pagination.py b/tests/selenium/test_pagination.py
index 9c45c217a..dee2bf1b5 100644
--- a/tests/selenium/test_pagination.py
+++ b/tests/selenium/test_pagination.py
@@ -1,6 +1,8 @@
 import dash
 from dash.dependencies import Input, Output
 from dash.exceptions import PreventUpdate
+import dash_html_components as html
+import dash_core_components as dcc
 
 from dash_table import DataTable
 
@@ -205,3 +207,44 @@ def test_tpag010_limits_page(test):
 
     assert target.paging.current.get_value() == "10"
     assert test.get_log_errors() == []
+
+
+def get_app2():
+    app = dash.Dash(__name__)
+
+    app.layout = html.Div(
+        [
+            html.Button("i=20", id="button", n_clicks=0),
+            DataTable(
+                id="table",
+                page_size=5,
+                columns=[{"name": "i", "id": "i"}, {"name": "square", "id": "square"}],
+                data=[{"i": i, "square": i ** 2} for i in range(50 + 1)],
+                page_current=5,
+            ),
+            dcc.Graph(),
+        ]
+    )
+
+    @app.callback(Output("table", "data"), Input("button", "n_clicks"))
+    def update_table_data(n):
+        return (
+            [{"i": i, "square": i ** 2} for i in range(20 + 1)]
+            if n > 0
+            else dash.no_update
+        )
+
+    return app
+
+
+def test_tpag011_valid_page(test):
+    test.start_server(get_app2())
+
+    target = test.table("table")
+    test.find_element("#button").click()
+
+    assert target.paging.current.get_value() == "1"
+    assert test.get_log_errors() == []
+
+    test.table("table").is_ready()
+    test.percy_snapshot("test_tpag011 Pagination row visible")