diff --git a/superset/assets/visualizations/nvd3_vis.js b/superset/assets/visualizations/nvd3_vis.js
index 5abf3d353899e..ae6e29abe28c4 100644
--- a/superset/assets/visualizations/nvd3_vis.js
+++ b/superset/assets/visualizations/nvd3_vis.js
@@ -261,7 +261,8 @@ function nvd3Vis(slice, payload) {
           s += '</table>';
           return s;
         });
-        chart.pointRange([5, fd.max_bubble_size * fd.max_bubble_size]);
+        chart.pointRange([5, fd.max_bubble_size ** 2]);
+        chart.pointDomain([0, d3.max(payload.data, d => d3.max(d.values, v => v.size))]);
         break;
 
       case 'area':
diff --git a/superset/viz.py b/superset/viz.py
index 48a4d9b4dda3c..5dec4a172b156 100755
--- a/superset/viz.py
+++ b/superset/viz.py
@@ -656,6 +656,7 @@ def query_obj(self):
         self.z_metric = form_data.get('size')
         self.entity = form_data.get('entity')
         self.series = form_data.get('series')
+        d['row_limit'] = form_data.get('limit')
 
         d['metrics'] = [
             self.z_metric,