diff --git a/spi/src/main/java/org/opensearch/jobscheduler/spi/utils/LockService.java b/spi/src/main/java/org/opensearch/jobscheduler/spi/utils/LockService.java
index 862f2d58..0ddd4a79 100644
--- a/spi/src/main/java/org/opensearch/jobscheduler/spi/utils/LockService.java
+++ b/spi/src/main/java/org/opensearch/jobscheduler/spi/utils/LockService.java
@@ -24,7 +24,6 @@
 import org.opensearch.action.update.UpdateRequest;
 import org.opensearch.client.Client;
 import org.opensearch.cluster.service.ClusterService;
-import org.opensearch.common.settings.Settings;
 import org.opensearch.common.xcontent.LoggingDeprecationHandler;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.core.xcontent.ToXContent;
@@ -43,9 +42,6 @@
 import java.nio.charset.StandardCharsets;
 import java.time.Instant;
 
-import static org.opensearch.indices.replication.common.ReplicationType.DOCUMENT;
-import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_REPLICATION_TYPE;
-
 public final class LockService {
     private static final Logger logger = LogManager.getLogger(LockService.class);
     private static final String LOCK_INDEX_NAME = ".opendistro-job-scheduler-lock";
@@ -84,10 +80,7 @@ void createLockIndex(ActionListener<Boolean> listener) {
         if (lockIndexExist()) {
             listener.onResponse(true);
         } else {
-            // Temporarily force DOCUMENT replication until SEGMENT supports GET by id
-            // https://github.com/opensearch-project/OpenSearch/issues/8536
-            Settings replicationSettings = Settings.builder().put(SETTING_REPLICATION_TYPE, DOCUMENT.name()).build();
-            final CreateIndexRequest request = new CreateIndexRequest(LOCK_INDEX_NAME, replicationSettings).mapping(lockMapping());
+            final CreateIndexRequest request = new CreateIndexRequest(LOCK_INDEX_NAME).mapping(lockMapping());
             client.admin()
                 .indices()
                 .create(request, ActionListener.wrap(response -> listener.onResponse(response.isAcknowledged()), exception -> {