diff --git a/docs/changelog/139526.yaml b/docs/changelog/139526.yaml
new file mode 100644
index 0000000000000..2b291dc69c528
--- /dev/null
+++ b/docs/changelog/139526.yaml
@@ -0,0 +1,5 @@
+pr: 139526
+summary: Fix `index.mapping.use_doc_values_skippers` defaults in serverless
+area: Mapping
+type: bug
+issues: []
diff --git a/server/src/main/java/org/elasticsearch/index/IndexSettings.java b/server/src/main/java/org/elasticsearch/index/IndexSettings.java
index f98c8403f2d28..8a8618b6e79db 100644
--- a/server/src/main/java/org/elasticsearch/index/IndexSettings.java
+++ b/server/src/main/java/org/elasticsearch/index/IndexSettings.java
@@ -771,25 +771,21 @@ public Iterator<Setting<?>> settings() {
         Property.ServerlessPublic
     );
 
+    private static final boolean DOC_VALUES_SKIPPER = new FeatureFlag("doc_values_skipper").isEnabled();
     public static final Setting<Boolean> USE_DOC_VALUES_SKIPPER = Setting.boolSetting("index.mapping.use_doc_values_skipper", s -> {
         IndexVersion iv = SETTING_INDEX_VERSION_CREATED.get(s);
         if (MODE.get(s) == IndexMode.TIME_SERIES) {
-            if (DiscoveryNode.isStateless(s)) {
-                if (iv.onOrAfter(IndexVersions.STATELESS_SKIPPERS_ENABLED_FOR_TSDB)) {
-                    return "true";
-                } else {
-                    return "false";
-                }
+            if (DOC_VALUES_SKIPPER && iv.onOrAfter(IndexVersions.SKIPPERS_ENABLED_BY_DEFAULT)) {
+                return "true";
             }
-            if (iv.onOrAfter(IndexVersions.SKIPPERS_ENABLED_BY_DEFAULT)) {
+            if (iv.onOrAfter(IndexVersions.STATELESS_SKIPPERS_ENABLED_FOR_TSDB)) {
                 return "true";
             }
             return "false";
         } else {
-            if (DiscoveryNode.isStateless(s)) {
-                return "false";
-            }
-            if (iv.onOrAfter(IndexVersions.SKIPPERS_ENABLED_BY_DEFAULT) && iv.before(IndexVersions.SKIPPER_DEFAULTS_ONLY_ON_TSDB)) {
+            if (DOC_VALUES_SKIPPER
+                && iv.onOrAfter(IndexVersions.SKIPPERS_ENABLED_BY_DEFAULT)
+                && iv.before(IndexVersions.SKIPPER_DEFAULTS_ONLY_ON_TSDB)) {
                 return "true";
             }
             return "false";
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/SkipperSettingsTests.java b/server/src/test/java/org/elasticsearch/index/mapper/SkipperSettingsTests.java
index b79b2cfd551ef..6a1d5f89c089a 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/SkipperSettingsTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/SkipperSettingsTests.java
@@ -27,10 +27,6 @@ public void testSkipperSettingDefaults() {
             IndexSettings indexSettings = settings(IndexVersion.current(), b -> {});
             assertFalse(indexSettings.useDocValuesSkipper());
         }
-        {
-            IndexSettings indexSettings = settings(IndexVersions.STANDARD_INDEXES_USE_SKIPPERS, b -> {});
-            assertTrue(indexSettings.useDocValuesSkipper());
-        }
         {
             IndexSettings indexSettings = settings(IndexVersions.SKIPPER_DEFAULTS_ONLY_ON_TSDB, b -> {});
             assertFalse(indexSettings.useDocValuesSkipper());
@@ -73,12 +69,6 @@ public void testLogsDBSkipperSettingDefaults() {
             );
             assertFalse(indexSettings.useDocValuesSkipper());
         }
-        {
-            IndexSettings indexSettings = settings(IndexVersions.STANDARD_INDEXES_USE_SKIPPERS, b -> {
-                b.put(IndexSettings.MODE.getKey(), IndexMode.LOGSDB.getName());
-            });
-            assertTrue(indexSettings.useDocValuesSkipper());
-        }
         {
             IndexSettings indexSettings = settings(IndexVersions.SKIPPER_DEFAULTS_ONLY_ON_TSDB, b -> {
                 b.put(IndexSettings.MODE.getKey(), IndexMode.LOGSDB.getName());