diff --git a/superset/assets/backendSync.json b/superset/assets/backendSync.json
index 389da9cc2362d..68684bdcb633e 100644
--- a/superset/assets/backendSync.json
+++ b/superset/assets/backendSync.json
@@ -1635,7 +1635,7 @@
       "freeForm": true,
       "label": "Number format",
       "renderTrigger": true,
-      "default": ".3s",
+      "default": "SMART_NUMBER",
       "choices": [
         [
           ".1s",
@@ -2085,7 +2085,7 @@
       "freeForm": true,
       "label": "X Axis Format",
       "renderTrigger": true,
-      "default": ".3s",
+      "default": "SMART_NUMBER",
       "choices": [
         [
           ".1s",
@@ -2165,7 +2165,7 @@
       "freeForm": true,
       "label": "Y Axis Format",
       "renderTrigger": true,
-      "default": ".3s",
+      "default": "SMART_NUMBER",
       "choices": [
         [
           ".1s",
@@ -2206,7 +2206,7 @@
       "type": "SelectControl",
       "freeForm": true,
       "label": "Right Axis Format",
-      "default": ".3s",
+      "default": "SMART_NUMBER",
       "choices": [
         [
           ".1s",
diff --git a/superset/assets/src/explore/controlPanels/Bubble.js b/superset/assets/src/explore/controlPanels/Bubble.js
index d3cdaca647e2c..638e6d105b6fa 100644
--- a/superset/assets/src/explore/controlPanels/Bubble.js
+++ b/superset/assets/src/explore/controlPanels/Bubble.js
@@ -62,9 +62,6 @@ export default {
     },
   ],
   controlOverrides: {
-    x_axis_format: {
-      default: '.3s',
-    },
     color_scheme: {
       renderTrigger: false,
     },
diff --git a/superset/assets/src/explore/controls.jsx b/superset/assets/src/explore/controls.jsx
index ae73e801cec91..c72348a091f47 100644
--- a/superset/assets/src/explore/controls.jsx
+++ b/superset/assets/src/explore/controls.jsx
@@ -79,6 +79,7 @@ const D3_FORMAT_DOCS = 'D3 format syntax: https://github.com/d3/d3-format';
 
 // input choices & options
 const D3_FORMAT_OPTIONS = [
+  ['SMART_NUMBER', 'Adaptative formating'],
   ['.1s', '.1s (12345.432 => 10k)'],
   ['.3s', '.3s (12345.432 => 12.3k)'],
   [',.1%', ',.1% (12345.432 => 1,234,543.2%)'],
@@ -989,7 +990,7 @@ export const controls = {
     freeForm: true,
     label: t('Number format'),
     renderTrigger: true,
-    default: '.3s',
+    default: 'SMART_NUMBER',
     choices: D3_FORMAT_OPTIONS,
     description: D3_FORMAT_DOCS,
   },
@@ -1232,7 +1233,7 @@ export const controls = {
     freeForm: true,
     label: t('X Axis Format'),
     renderTrigger: true,
-    default: '.3s',
+    default: 'SMART_NUMBER',
     choices: D3_FORMAT_OPTIONS,
     description: D3_FORMAT_DOCS,
   },
@@ -1252,7 +1253,7 @@ export const controls = {
     freeForm: true,
     label: t('Y Axis Format'),
     renderTrigger: true,
-    default: '.3s',
+    default: 'SMART_NUMBER',
     choices: D3_FORMAT_OPTIONS,
     description: D3_FORMAT_DOCS,
     mapStateToProps: (state) => {
@@ -1273,7 +1274,7 @@ export const controls = {
     type: 'SelectControl',
     freeForm: true,
     label: t('Right Axis Format'),
-    default: '.3s',
+    default: 'SMART_NUMBER',
     choices: D3_FORMAT_OPTIONS,
     description: D3_FORMAT_DOCS,
   },