diff --git a/superset-frontend/src/explore/components/controls/MetricControl/MetricDefinitionValue.jsx b/superset-frontend/src/explore/components/controls/MetricControl/MetricDefinitionValue.jsx
index ce234cb5e..44a652754 100644
--- a/superset-frontend/src/explore/components/controls/MetricControl/MetricDefinitionValue.jsx
+++ b/superset-frontend/src/explore/components/controls/MetricControl/MetricDefinitionValue.jsx
@@ -18,20 +18,13 @@
  */
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Metric } from '@superset-ui/chart-controls/lib/types';
 import columnType from './columnType';
 import AdhocMetricOption from './AdhocMetricOption';
 import AdhocMetric from './AdhocMetric';
 import savedMetricType from './savedMetricType';
-import adhocMetricType from './adhocMetricType';
 
 const propTypes = {
-  option: PropTypes.oneOfType([
-    savedMetricType,
-    adhocMetricType,
-    Metric,
-    PropTypes.string,
-  ]).isRequired,
+  option: PropTypes.oneOfType([PropTypes.object, PropTypes.string]).isRequired,
   index: PropTypes.number.isRequired,
   onMetricEdit: PropTypes.func,
   onRemoveMetric: PropTypes.func,
diff --git a/superset-frontend/src/explore/components/controls/withAsyncVerification.tsx b/superset-frontend/src/explore/components/controls/withAsyncVerification.tsx
index 7e758625d..a13e77123 100644
--- a/superset-frontend/src/explore/components/controls/withAsyncVerification.tsx
+++ b/superset-frontend/src/explore/components/controls/withAsyncVerification.tsx
@@ -23,8 +23,10 @@ import React, {
   useRef,
   useState,
 } from 'react';
-import sharedControlComponents from '@superset-ui/chart-controls/lib/shared-controls/components';
-import { ExtraControlProps } from '@superset-ui/chart-controls';
+import {
+  ExtraControlProps,
+  sharedControlComponents,
+} from '@superset-ui/chart-controls';
 import { JsonArray, JsonValue, t } from '@superset-ui/core';
 import { ControlProps } from 'src/explore/components/Control';
 import builtInControlComponents from 'src/explore/components/controls';