diff --git a/swift/internal/compiling.bzl b/swift/internal/compiling.bzl
index 778a6ae04..f16fdd656 100644
--- a/swift/internal/compiling.bzl
+++ b/swift/internal/compiling.bzl
@@ -693,10 +693,7 @@ def compile_action_configs():
 
         # Configure index-while-building.
         swift_toolchain_config.action_config(
-            actions = [
-                swift_action_names.COMPILE,
-                swift_action_names.DERIVE_FILES,
-            ],
+            actions = [swift_action_names.COMPILE],
             configurators = [_index_while_building_configurator],
             features = [SWIFT_FEATURE_INDEX_WHILE_BUILDING],
         ),
diff --git a/test/split_derived_files_tests.bzl b/test/split_derived_files_tests.bzl
index 89baa9b47..baba76f70 100644
--- a/test/split_derived_files_tests.bzl
+++ b/test/split_derived_files_tests.bzl
@@ -56,6 +56,14 @@ split_swiftmodule_skip_function_bodies_test = make_action_command_line_test_rule
         ],
     },
 )
+split_swiftmodule_indexing_test = make_action_command_line_test_rule(
+    config_settings = {
+        "//command_line_option:features": [
+            "swift.index_while_building",
+            "swift.split_derived_files_generation",
+        ],
+    },
+)
 
 def split_derived_files_test_suite(name = "split_derived_files"):
     """Test suite for split derived files options.
@@ -220,6 +228,34 @@ def split_derived_files_test_suite(name = "split_derived_files"):
         target_under_test = "@build_bazel_rules_swift//test/fixtures/debug_settings:simple",
     )
 
+    split_swiftmodule_indexing_test(
+        name = "{}_object_only_indexing".format(name),
+        expected_argv = [
+            "-emit-object",
+            "-index-store-path",
+        ],
+        mnemonic = "SwiftCompile",
+        not_expected_argv = [
+            "-emit-module-path",
+        ],
+        tags = [name],
+        target_under_test = "@build_bazel_rules_swift//test/fixtures/debug_settings:simple",
+    )
+
+    split_swiftmodule_indexing_test(
+        name = "{}_swiftmodule_only_indexing".format(name),
+        expected_argv = [
+            "-emit-module-path",
+        ],
+        mnemonic = "SwiftDeriveFiles",
+        not_expected_argv = [
+            "-emit-object",
+            "-index-store-path",
+        ],
+        tags = [name],
+        target_under_test = "@build_bazel_rules_swift//test/fixtures/debug_settings:simple",
+    )
+
     native.test_suite(
         name = name,
         tags = [name],