diff --git a/x-pack/legacy/plugins/maps/public/components/metric_editor.js b/x-pack/legacy/plugins/maps/public/components/metric_editor.js
index 65f345925fd84..f3123d5645ccd 100644
--- a/x-pack/legacy/plugins/maps/public/components/metric_editor.js
+++ b/x-pack/legacy/plugins/maps/public/components/metric_editor.js
@@ -107,7 +107,7 @@ MetricEditor.propTypes = {
     field: PropTypes.string,
     label: PropTypes.string,
   }),
-  fields: PropTypes.object, // indexPattern.fields IndexedArray object
+  fields: PropTypes.array,
   onChange: PropTypes.func.isRequired,
   metricsFilter: PropTypes.func,
 };
diff --git a/x-pack/legacy/plugins/maps/public/components/metrics_editor.js b/x-pack/legacy/plugins/maps/public/components/metrics_editor.js
index 53d078369cf89..921466c13da91 100644
--- a/x-pack/legacy/plugins/maps/public/components/metrics_editor.js
+++ b/x-pack/legacy/plugins/maps/public/components/metrics_editor.js
@@ -92,7 +92,7 @@ export function MetricsEditor({ fields, metrics, onChange, allowMultipleMetrics,
 
 MetricsEditor.propTypes = {
   metrics: PropTypes.array,
-  fields: PropTypes.object, // indexPattern.fields IndexedArray object
+  fields: PropTypes.array,
   onChange: PropTypes.func.isRequired,
   allowMultipleMetrics: PropTypes.bool,
   metricsFilter: PropTypes.func,
diff --git a/x-pack/legacy/plugins/maps/public/components/single_field_select.js b/x-pack/legacy/plugins/maps/public/components/single_field_select.js
index 2bce3f7de5697..7d7625f9c67f7 100644
--- a/x-pack/legacy/plugins/maps/public/components/single_field_select.js
+++ b/x-pack/legacy/plugins/maps/public/components/single_field_select.js
@@ -87,10 +87,7 @@ export function SingleFieldSelect({ fields,
 
 SingleFieldSelect.propTypes = {
   placeholder: PropTypes.string,
-  fields: PropTypes.oneOfType([
-    PropTypes.object, // IndexedArray object
-    PropTypes.array // array of Field objects
-  ]),
+  fields: PropTypes.array,
   onChange: PropTypes.func.isRequired,
   value: PropTypes.string, // fieldName
   filterField: PropTypes.func,
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/join_editor/resources/join_expression.js b/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/join_editor/resources/join_expression.js
index 994522b9086d4..44629d16e6fb3 100644
--- a/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/join_editor/resources/join_expression.js
+++ b/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/join_editor/resources/join_expression.js
@@ -254,7 +254,7 @@ JoinExpression.propTypes = {
 
   // Right field props
   rightValue: PropTypes.string,
-  rightFields: PropTypes.object, // indexPattern.fields IndexedArray object
+  rightFields: PropTypes.array,
   onRightFieldChange: PropTypes.func.isRequired,
 };
 
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/join_editor/resources/metrics_expression.js b/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/join_editor/resources/metrics_expression.js
index 1b493445789db..b9ddc34ab6ab0 100644
--- a/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/join_editor/resources/metrics_expression.js
+++ b/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/join_editor/resources/metrics_expression.js
@@ -121,7 +121,7 @@ export class MetricsExpression extends Component {
 
 MetricsExpression.propTypes = {
   metrics: PropTypes.array,
-  rightFields: PropTypes.object,  // indexPattern.fields IndexedArray object
+  rightFields: PropTypes.array,
   onChange: PropTypes.func.isRequired,
 };