diff --git a/superset/assets/src/explore/controls.jsx b/superset/assets/src/explore/controls.jsx
index 9e392edf2..94db55576 100644
--- a/superset/assets/src/explore/controls.jsx
+++ b/superset/assets/src/explore/controls.jsx
@@ -375,7 +375,7 @@ export const controls = {
     choices: () => sequentialSchemeRegistry
       .values()
       .map(value => [value.id, value.label]),
-    default: 'blue_white_yellow',
+    default: sequentialSchemeRegistry.getDefaultKey(),
     clearable: false,
     description: '',
     renderTrigger: true,
@@ -2066,7 +2066,7 @@ export const controls = {
   color_scheme: {
     type: 'ColorSchemeControl',
     label: t('Color Scheme'),
-    default: 'bnbColors',
+    default: categoricalSchemeRegistry.getDefaultKey(),
     renderTrigger: true,
     choices: () => categoricalSchemeRegistry.keys().map(s => ([s, s])),
     description: t('The color scheme for rendering chart'),
diff --git a/superset/assets/src/setup/setupColors.js b/superset/assets/src/setup/setupColors.js
index 99df66d1e..d3f80ad10 100644
--- a/superset/assets/src/setup/setupColors.js
+++ b/superset/assets/src/setup/setupColors.js
@@ -40,4 +40,5 @@ export default function setupColors() {
       sequentialSchemeRegistry.registerValue(scheme.id, scheme);
     });
   });
+  sequentialSchemeRegistry.setDefaultKey('blue_white_yellow');
 }