diff --git a/x-pack/plugins/maps/public/layers/vector_layer.js b/x-pack/plugins/maps/public/layers/vector_layer.js
index 74ddf11c6beb4..1707d6d4b6ca2 100644
--- a/x-pack/plugins/maps/public/layers/vector_layer.js
+++ b/x-pack/plugins/maps/public/layers/vector_layer.js
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import turf from 'turf';
 import React from 'react';
 import { AbstractLayer } from './layer';
 import { VectorStyle } from './styles/vector/vector_style';
@@ -30,6 +29,7 @@ import {
   canSkipFormattersUpdate,
 } from './util/can_skip_fetch';
 import { assignFeatureIds } from './util/assign_feature_ids';
+import { getFeatureCollectionBounds } from '../../util/get_feature_collection_bounds';
 import {
   getFillFilterExpression,
   getLineFilterExpression,
@@ -153,31 +153,10 @@ export class VectorLayer extends AbstractLayer {
     return this.getCurrentStyle().renderLegendDetails();
   }
 
-  _getBoundsBasedOnData() {
-    const featureCollection = this._getSourceFeatureCollection();
-    if (!featureCollection) {
-      return null;
-    }
-
-    const visibleFeatures = featureCollection.features.filter(
-      feature => feature.properties[FEATURE_VISIBLE_PROPERTY_NAME]
-    );
-    const bbox = turf.bbox({
-      type: 'FeatureCollection',
-      features: visibleFeatures,
-    });
-    return {
-      minLon: bbox[0],
-      minLat: bbox[1],
-      maxLon: bbox[2],
-      maxLat: bbox[3],
-    };
-  }
-
   async getBounds(dataFilters) {
     const isStaticLayer = !this.getSource().isBoundsAware();
     if (isStaticLayer) {
-      return this._getBoundsBasedOnData();
+      return getFeatureCollectionBounds(this._getSourceFeatureCollection(), this._hasJoins());
     }
 
     const searchFilters = this._getSearchFilters(