diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2954d898c..fcdbe1974 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ## [Unreleased 2.x](https://github.com/opensearch-project/k-NN/compare/2.17...2.x)
 ### Features
 ### Enhancements
+* Add short circuit if no live docs are in segments [#2059](https://github.com/opensearch-project/k-NN/pull/2059)
 ### Bug Fixes
 ### Infrastructure
 ### Documentation
diff --git a/src/main/java/org/opensearch/knn/index/codec/KNN990Codec/NativeEngines990KnnVectorsWriter.java b/src/main/java/org/opensearch/knn/index/codec/KNN990Codec/NativeEngines990KnnVectorsWriter.java
index dba0926ff..0d016a60b 100644
--- a/src/main/java/org/opensearch/knn/index/codec/KNN990Codec/NativeEngines990KnnVectorsWriter.java
+++ b/src/main/java/org/opensearch/knn/index/codec/KNN990Codec/NativeEngines990KnnVectorsWriter.java
@@ -244,26 +244,25 @@ private <T, C> void trainAndIndex(
         final String operationName
     ) throws IOException {
         final VectorDataType vectorDataType = extractVectorDataType(fieldInfo);
-        KNNVectorValues<T> knnVectorValues = vectorValuesRetriever.apply(vectorDataType, fieldInfo, VectorProcessingContext);
-        QuantizationParams quantizationParams = quantizationService.getQuantizationParams(fieldInfo);
-        QuantizationState quantizationState = null;
         // Count the docIds
         int totalLiveDocs = getLiveDocs(vectorValuesRetriever.apply(vectorDataType, fieldInfo, VectorProcessingContext));
-        if (quantizationParams != null && totalLiveDocs > 0) {
+        if (totalLiveDocs == 0) {
+            log.debug("No live docs for field " + fieldInfo.name);
+            return;
+        }
+        QuantizationState quantizationState = null;
+        QuantizationParams quantizationParams = quantizationService.getQuantizationParams(fieldInfo);
+        if (quantizationParams != null) {
             initQuantizationStateWriterIfNecessary();
+            KNNVectorValues<T> knnVectorValues = vectorValuesRetriever.apply(vectorDataType, fieldInfo, VectorProcessingContext);
             quantizationState = quantizationService.train(quantizationParams, knnVectorValues, totalLiveDocs);
             quantizationStateWriter.writeState(fieldInfo.getFieldNumber(), quantizationState);
         }
-        NativeIndexWriter writer = (quantizationParams != null)
-            ? NativeIndexWriter.getWriter(fieldInfo, segmentWriteState, quantizationState)
-            : NativeIndexWriter.getWriter(fieldInfo, segmentWriteState);
-
-        knnVectorValues = vectorValuesRetriever.apply(vectorDataType, fieldInfo, VectorProcessingContext);
-
-        StopWatch stopWatch = new StopWatch();
-        stopWatch.start();
-        indexOperation.buildAndWrite(writer, knnVectorValues, totalLiveDocs);
-        long time_in_millis = stopWatch.totalTime().millis();
+        NativeIndexWriter writer = NativeIndexWriter.getWriter(fieldInfo, segmentWriteState, quantizationState);
+        KNNVectorValues<T> knnVectors = vectorValuesRetriever.apply(vectorDataType, fieldInfo, VectorProcessingContext);
+        StopWatch stopWatch = new StopWatch().start();
+        indexOperation.buildAndWrite(writer, knnVectors, totalLiveDocs);
+        long time_in_millis = stopWatch.stop().totalTime().millis();
         graphBuildTime.incrementBy(time_in_millis);
         log.warn("Graph build took " + time_in_millis + " ms for " + operationName);
     }