diff --git a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/feature_draw_controls/feature_edit_tools/feature_edit_tools.tsx b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/feature_draw_controls/feature_edit_tools/feature_edit_tools.tsx
index 656d57e977d0..bf7cdf715b9a 100644
--- a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/feature_draw_controls/feature_edit_tools/feature_edit_tools.tsx
+++ b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/feature_draw_controls/feature_edit_tools/feature_edit_tools.tsx
@@ -36,6 +36,7 @@ export function FeatureEditTools(props: Props) {
   const drawBBoxSelected = props.drawShape === DRAW_SHAPE.BOUNDS;
   const drawPointSelected = props.drawShape === DRAW_SHAPE.POINT;
   const deleteSelected = props.drawShape === DRAW_SHAPE.DELETE;
+  const isWaiting = props.drawShape === DRAW_SHAPE.WAIT;
 
   function toggleDrawShape(mode: DRAW_SHAPE) {
     if (mode && props.drawShape === mode) {
@@ -70,6 +71,7 @@ export function FeatureEditTools(props: Props) {
               aria-pressed={drawLineSelected}
               isSelected={drawLineSelected}
               display={drawLineSelected ? 'fill' : 'empty'}
+              isDisabled={isWaiting}
             />
 
             <EuiButtonIcon
@@ -89,6 +91,7 @@ export function FeatureEditTools(props: Props) {
               aria-pressed={drawPolygonSelected}
               isSelected={drawPolygonSelected}
               display={drawPolygonSelected ? 'fill' : 'empty'}
+              isDisabled={isWaiting}
             />
             <EuiButtonIcon
               className={classNames({
@@ -107,6 +110,7 @@ export function FeatureEditTools(props: Props) {
               aria-pressed={drawCircleSelected}
               isSelected={drawCircleSelected}
               display={drawCircleSelected ? 'fill' : 'empty'}
+              isDisabled={isWaiting}
             />
             <EuiButtonIcon
               className={classNames({
@@ -125,6 +129,7 @@ export function FeatureEditTools(props: Props) {
               aria-pressed={drawBBoxSelected}
               isSelected={drawBBoxSelected}
               display={drawBBoxSelected ? 'fill' : 'empty'}
+              isDisabled={isWaiting}
             />
           </>
         )}
@@ -145,6 +150,7 @@ export function FeatureEditTools(props: Props) {
           aria-pressed={drawPointSelected}
           isSelected={drawPointSelected}
           display={drawPointSelected ? 'fill' : 'empty'}
+          isDisabled={isWaiting}
         />
         <EuiButtonIcon
           className={classNames({
@@ -166,6 +172,7 @@ export function FeatureEditTools(props: Props) {
           aria-pressed={deleteSelected}
           isSelected={deleteSelected}
           display={deleteSelected ? 'fill' : 'empty'}
+          isDisabled={isWaiting}
         />
       </EuiPanel>
     </TrackApplicationView>
diff --git a/x-pack/plugins/maps/server/data_indexing/index_data.ts b/x-pack/plugins/maps/server/data_indexing/index_data.ts
index 59c90bb27956..e8525e1f3c81 100644
--- a/x-pack/plugins/maps/server/data_indexing/index_data.ts
+++ b/x-pack/plugins/maps/server/data_indexing/index_data.ts
@@ -26,7 +26,7 @@ export async function writeDataToIndex(
         })
       );
     }
-    const settings: WriteSettings = { index, body: data, refresh: true };
+    const settings: WriteSettings = { index, body: data, refresh: 'wait_for' };
     const resp = await asCurrentUser.index(settings);
     // @ts-expect-error always false
     if (resp.result === 'Error') {
diff --git a/x-pack/plugins/maps/server/data_indexing/indexing_routes.ts b/x-pack/plugins/maps/server/data_indexing/indexing_routes.ts
index 94a7391f6856..ef4eae327f37 100644
--- a/x-pack/plugins/maps/server/data_indexing/indexing_routes.ts
+++ b/x-pack/plugins/maps/server/data_indexing/indexing_routes.ts
@@ -150,7 +150,7 @@ export function initIndexingRoutes({
           const resp = await coreContext.elasticsearch.client.asCurrentUser.delete({
             index: request.body.index,
             id: request.params.featureId,
-            refresh: true,
+            refresh: 'wait_for',
           });
           // @ts-expect-error always false
           if (resp.result === 'Error') {