diff --git a/superset/assets/javascripts/explore/stores/visTypes.js b/superset/assets/javascripts/explore/stores/visTypes.js
index dd144c55c4..75443469f3 100644
--- a/superset/assets/javascripts/explore/stores/visTypes.js
+++ b/superset/assets/javascripts/explore/stores/visTypes.js
@@ -375,7 +375,7 @@ export const visTypes = {
         expanded: true,
         controlSetRows: [
           ['spatial', 'size'],
-          ['groupby', 'row_limit'],
+          ['row_limit', null],
         ],
       },
       {
@@ -413,7 +413,7 @@ export const visTypes = {
         expanded: true,
         controlSetRows: [
           ['spatial', 'size'],
-          ['groupby', 'row_limit'],
+          ['row_limit', null],
         ],
       },
       {
@@ -485,7 +485,7 @@ export const visTypes = {
         expanded: true,
         controlSetRows: [
           ['spatial', 'size'],
-          ['groupby', 'row_limit'],
+          ['row_limit', null],
         ],
       },
       {
@@ -656,8 +656,7 @@ export const visTypes = {
         label: t('Query'),
         expanded: true,
         controlSetRows: [
-          ['spatial', null],
-          ['groupby', 'row_limit'],
+          ['spatial', 'row_limit'],
         ],
       },
       {