diff --git a/src/main/java/com/google/devtools/build/lib/exec/SpawnInputExpander.java b/src/main/java/com/google/devtools/build/lib/exec/SpawnInputExpander.java
index 46d14f0..cec139a 100644
--- a/src/main/java/com/google/devtools/build/lib/exec/SpawnInputExpander.java
+++ b/src/main/java/com/google/devtools/build/lib/exec/SpawnInputExpander.java
@@ -151,7 +151,7 @@
                 : artifactExpander.getArchivedTreeArtifact((SpecialArtifact) artifact);
         if (archivedTreeArtifact != null) {
           // TODO(bazel-team): Add path mapping support for archived tree artifacts.
-          addMapping(inputSink, location, artifact, baseDirectory, /* owner= */ null);
+          addMapping(inputSink, location, archivedTreeArtifact, baseDirectory, artifact);
         } else {
           List<ActionInput> expandedInputs =
               ActionInputHelper.expandArtifacts(
diff --git a/src/test/java/com/google/devtools/build/lib/exec/SpawnInputExpanderTest.java b/src/test/java/com/google/devtools/build/lib/exec/SpawnInputExpanderTest.java
index dfd0384..8536a54 100644
--- a/src/test/java/com/google/devtools/build/lib/exec/SpawnInputExpanderTest.java
+++ b/src/test/java/com/google/devtools/build/lib/exec/SpawnInputExpanderTest.java
@@ -379,8 +379,8 @@
     verify(inputSink)
         .acceptMapping(
             PathFragment.create("runfiles/workspace/treeArtifact"),
-            treeArtifact,
-            /* owner= */ null);
+            archivedTreeArtifact,
+            treeArtifact);
   }
 
   @Test