diff --git a/web/src/components/HeaderRow/HeaderRow.tsx b/web/src/components/HeaderRow/HeaderRow.tsx
index 73e373d730..c8646c773a 100644
--- a/web/src/components/HeaderRow/HeaderRow.tsx
+++ b/web/src/components/HeaderRow/HeaderRow.tsx
@@ -6,12 +6,11 @@ import * as S from './HeaderRow.styled';
 
 interface IProps {
   header: THeader;
-  index: number;
   onCreateTestOutput(attribute: TSpanFlatAttribute): void;
   onCreateTestSpec(attribute: TSpanFlatAttribute): void;
 }
 
-const HeaderRow = ({header: {key = '', value = ''}, index, onCreateTestOutput, onCreateTestSpec}: IProps) => {
+const HeaderRow = ({header: {key = '', value = ''}, onCreateTestOutput, onCreateTestSpec}: IProps) => {
   return (
     <S.HeaderContainer>
       <S.Header>
@@ -21,7 +20,7 @@ const HeaderRow = ({header: {key = '', value = ''}, index, onCreateTestOutput, o
         </S.HeaderValue>
       </S.Header>
       <AttributeActions
-        attribute={{key: `tracetest.response.headers | json_path '$[${index}].Value'`, value}}
+        attribute={{key: `tracetest.response.headers | json_path '$[?(@.Key=="${key}")].Value'`, value}}
         onCreateTestOutput={onCreateTestOutput}
         onCreateTestSpec={onCreateTestSpec}
       />
diff --git a/web/src/components/RunDetailTriggerResponse/ResponseHeaders.tsx b/web/src/components/RunDetailTriggerResponse/ResponseHeaders.tsx
index 6c9c6f51f5..d7d62ba55b 100644
--- a/web/src/components/RunDetailTriggerResponse/ResponseHeaders.tsx
+++ b/web/src/components/RunDetailTriggerResponse/ResponseHeaders.tsx
@@ -17,10 +17,9 @@ const ResponseHeaders = ({headers, state, onCreateTestOutput, onCreateTestSpec}:
   isRunStateFinished(state) || !!headers ? (
     <S.HeadersList>
       {headers &&
-        headers.map((header, index) => (
+        headers.map(header => (
           <HeaderRow
             header={header}
-            index={index}
             key={header.key}
             onCreateTestOutput={onCreateTestOutput}
             onCreateTestSpec={onCreateTestSpec}