diff --git a/superset/config.py b/superset/config.py
index bd02bb4fcd..65f3887793 100644
--- a/superset/config.py
+++ b/superset/config.py
@@ -250,8 +250,7 @@ BACKUP_COUNT = 30
 MAPBOX_API_KEY = os.environ.get('MAPBOX_API_KEY', '')
 
 # Maximum number of rows returned in the SQL editor
-SQL_MAX_ROW = 1000000
-DISPLAY_SQL_MAX_ROW = 1000
+SQL_MAX_ROW = 1000
 
 # Maximum number of tables/views displayed in the dropdown window in SQL Lab.
 MAX_TABLE_NAMES = 3000
diff --git a/superset/views/core.py b/superset/views/core.py
index 0e51eac044..7ada916e64 100755
--- a/superset/views/core.py
+++ b/superset/views/core.py
@@ -2477,7 +2477,7 @@ class Superset(BaseSupersetView):
                 '{}'.format(rejected_tables)))
 
         payload = utils.zlib_decompress_to_string(blob)
-        display_limit = app.config.get('DISPLAY_SQL_MAX_ROW', None)
+        display_limit = app.config.get('SQL_MAX_ROW', None)
         if display_limit:
             payload_json = json.loads(payload)
             payload_json['data'] = payload_json['data'][:display_limit]