diff --git a/gapis/resolve/set.go b/gapis/resolve/set.go
index b8ae9002fd..8e6ac224f1 100644
--- a/gapis/resolve/set.go
+++ b/gapis/resolve/set.go
@@ -137,6 +137,11 @@ func change(ctx context.Context, p path.Node, val interface{}) (path.Node, error
 		if len(cmd.Extras().All()) == 0 {
 			cmd.Extras().Add(oldCmd.Extras().All()...)
 		}
+
+		// Propagate caller (not exposed to client)
+		cmd.SetCaller(oldCmd.Caller())
+
+		// Replace the command
 		cmds[cmdIdx] = cmd
 
 		// Store the new command list