diff --git a/frontend/src/components/QueryBuilderV2/QueryV2/QueryAddOns/QueryAddOns.tsx b/frontend/src/components/QueryBuilderV2/QueryV2/QueryAddOns/QueryAddOns.tsx
index 3c0d18b87342..dcd307ca1636 100644
--- a/frontend/src/components/QueryBuilderV2/QueryV2/QueryAddOns/QueryAddOns.tsx
+++ b/frontend/src/components/QueryBuilderV2/QueryV2/QueryAddOns/QueryAddOns.tsx
@@ -68,19 +68,21 @@ function QueryAddOns({
 	isListViewPanel,
 	showReduceTo,
 	panelType,
+	index,
 }: {
 	query: IBuilderQuery;
 	version: string;
 	isListViewPanel: boolean;
 	showReduceTo: boolean;
 	panelType: PANEL_TYPES | null;
+	index: number;
 }): JSX.Element {
 	const [addOns, setAddOns] = useState<AddOn[]>(ADD_ONS);
 
 	const [selectedViews, setSelectedViews] = useState<AddOn[]>([]);
 
 	const { handleChangeQueryData } = useQueryOperations({
-		index: 0,
+		index,
 		query,
 		entityVersion: '',
 	});
diff --git a/frontend/src/components/QueryBuilderV2/QueryV2/QueryV2.tsx b/frontend/src/components/QueryBuilderV2/QueryV2/QueryV2.tsx
index 8722424b5b97..8604e3703032 100644
--- a/frontend/src/components/QueryBuilderV2/QueryV2/QueryV2.tsx
+++ b/frontend/src/components/QueryBuilderV2/QueryV2/QueryV2.tsx
@@ -168,6 +168,7 @@ export const QueryV2 = memo(function QueryV2({
 
 					{!showOnlyWhereClause && (
 						<QueryAddOns
+							index={index}
 							query={query}
 							version="v3"
 							isListViewPanel={false}