diff --git a/config-service-impl/src/main/java/org/hypertrace/config/service/store/DocumentConfigStore.java b/config-service-impl/src/main/java/org/hypertrace/config/service/store/DocumentConfigStore.java
index 7693a053..29f187a4 100644
--- a/config-service-impl/src/main/java/org/hypertrace/config/service/store/DocumentConfigStore.java
+++ b/config-service-impl/src/main/java/org/hypertrace/config/service/store/DocumentConfigStore.java
@@ -6,7 +6,6 @@
 import static org.hypertrace.config.service.store.ConfigDocument.RESOURCE_FIELD_NAME;
 import static org.hypertrace.config.service.store.ConfigDocument.RESOURCE_NAMESPACE_FIELD_NAME;
 import static org.hypertrace.config.service.store.ConfigDocument.TENANT_ID_FIELD_NAME;
-import static org.hypertrace.config.service.store.ConfigDocument.VERSION_FIELD_NAME;
 import static org.hypertrace.core.documentstore.Filter.Op.OR;
 
 import com.google.common.collect.Maps;
@@ -78,7 +77,7 @@ public UpsertedConfig writeConfig(
       UpsertConfigRequest request,
       String lastUpdatedUserEmail)
       throws IOException {
-    Optional<ConfigDocument> previousConfigDoc = getLatestVersionConfigDoc(configResourceContext);
+    Optional<ConfigDocument> previousConfigDoc = getConfigDocument(configResourceContext);
     Optional<ContextSpecificConfig> optionalPreviousConfig =
         previousConfigDoc.flatMap(this::convertToContextSpecificConfig);
 
@@ -198,8 +197,7 @@ public void deleteConfigs(java.util.Collection<ConfigResourceContext> configReso
   @Override
   public Optional<ContextSpecificConfig> getConfig(ConfigResourceContext configResourceContext)
       throws IOException {
-    return getLatestVersionConfigDoc(configResourceContext)
-        .flatMap(this::convertToContextSpecificConfig);
+    return getConfigDocument(configResourceContext).flatMap(this::convertToContextSpecificConfig);
   }
 
   @Override
@@ -257,7 +255,6 @@ private Query buildQuery(
       queryBuilder.setPagination(
           Pagination.builder().offset(pagination.getOffset()).limit(pagination.getLimit()).build());
     }
-    queryBuilder.addSort(IdentifierExpression.of(VERSION_FIELD_NAME), SortOrder.DESC);
     if (!sortByList.isEmpty()) {
       sortByList.forEach(
           sortBy ->
@@ -313,13 +310,11 @@ public boolean healthCheck() {
     return datastore.healthCheck();
   }
 
-  private Optional<ConfigDocument> getLatestVersionConfigDoc(
-      ConfigResourceContext configResourceContext) throws IOException {
+  private Optional<ConfigDocument> getConfigDocument(ConfigResourceContext configResourceContext)
+      throws IOException {
     Query query =
         Query.builder()
             .setFilter(getConfigResourceContextFilterTypeExpression(configResourceContext))
-            .addSort(IdentifierExpression.of(VERSION_FIELD_NAME), SortOrder.DESC)
-            .setPagination(Pagination.builder().offset(0).limit(1).build())
             .build();
 
     try (CloseableIterator<Document> documentIterator =
diff --git a/config-service-impl/src/test/java/org/hypertrace/config/service/store/DocumentConfigStoreTest.java b/config-service-impl/src/test/java/org/hypertrace/config/service/store/DocumentConfigStoreTest.java
index e062b766..52e5f9eb 100644
--- a/config-service-impl/src/test/java/org/hypertrace/config/service/store/DocumentConfigStoreTest.java
+++ b/config-service-impl/src/test/java/org/hypertrace/config/service/store/DocumentConfigStoreTest.java
@@ -25,7 +25,6 @@
 import io.grpc.StatusRuntimeException;
 import java.io.IOException;
 import java.time.Clock;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
@@ -376,10 +375,7 @@ void writeAllConfigs() throws IOException {
   @Test
   void buildQuery_withDefaultPagination() throws Exception {
     List<SortingSpec> expectedSorts =
-        Arrays.asList(
-            SortingSpec.of(
-                IdentifierExpression.of("configVersion"),
-                org.hypertrace.core.documentstore.expression.operators.SortOrder.DESC),
+        List.of(
             SortingSpec.of(
                 IdentifierExpression.of("creationTimestamp"),
                 org.hypertrace.core.documentstore.expression.operators.SortOrder.DESC));
@@ -425,10 +421,7 @@ void buildQuery_withCustomSorting() throws IOException {
             .build();
 
     List<SortingSpec> expectedSorts =
-        Arrays.asList(
-            SortingSpec.of(
-                IdentifierExpression.of("configVersion"),
-                org.hypertrace.core.documentstore.expression.operators.SortOrder.DESC),
+        List.of(
             SortingSpec.of(
                 IdentifierExpression.of("config.test.path"),
                 org.hypertrace.core.documentstore.expression.operators.SortOrder.DESC));