diff --git a/superset/assets/src/components/TableSelector.jsx b/superset/assets/src/components/TableSelector.jsx
index d380241b7..9ead6dd7f 100644
--- a/superset/assets/src/components/TableSelector.jsx
+++ b/superset/assets/src/components/TableSelector.jsx
@@ -218,7 +218,8 @@ export default class TableSelector extends React.PureComponent {
           '/api/v1/database/?q=' +
           '(keys:!(none),' +
           'filters:!((col:expose_in_sqllab,opr:eq,value:!t)),' +
-          'order_columns:database_name,order_direction:asc)'
+          'order_columns:database_name,order_direction:asc,' +
+          'page:0,page_size:-1)'
         }
         onChange={this.onDatabaseChange}
         onAsyncError={() => this.props.handleError(t('Error while fetching database list'))}
diff --git a/superset/views/database/api.py b/superset/views/database/api.py
index dea17ba56..2bb8ea5f3 100644
--- a/superset/views/database/api.py
+++ b/superset/views/database/api.py
@@ -50,6 +50,8 @@ class DatabaseRestApi(DatabaseMixin, ModelRestApi):
         "allows_subquery",
         "backend",
     ]
+    # Removes the local limit for the page size
+    max_page_size = -1
 
 
 appbuilder.add_api(DatabaseRestApi)