diff --git a/src/homepageExperience/components/steps/nodejs/ExecuteAggregateQuery.tsx b/src/homepageExperience/components/steps/nodejs/ExecuteAggregateQuery.tsx
index f8081bbba5..3bc1d9cda0 100644
--- a/src/homepageExperience/components/steps/nodejs/ExecuteAggregateQuery.tsx
+++ b/src/homepageExperience/components/steps/nodejs/ExecuteAggregateQuery.tsx
@@ -29,18 +29,13 @@ fluxQuery = \`from(bucket: "${bucket}")
  |> filter(fn: (r) => r._measurement == "measurement1")
  |> mean()\`
 
-queryClient.queryRows(fluxQuery, {
-  next: (row, tableMeta) => {
-    const tableObject = tableMeta.toObject(row)
+async function iterateRowsAggregated() {
+  for await (const {values, tableMeta} of queryClient.iterateRows(fluxQuery)) {
+    const tableObject = tableMeta.toObject(values)
     console.log(tableObject)
-  },
-  error: (error) => {
-    console.error('\\nError', error)
-  },
-  complete: () => {
-    console.log('\\nSuccess')
-  },
-})`
+  }
+}
+iterateRowsAggregated()`
 
   return (
     <>
diff --git a/src/homepageExperience/components/steps/nodejs/ExecuteQuery.tsx b/src/homepageExperience/components/steps/nodejs/ExecuteQuery.tsx
index 52196091ee..e317081a69 100644
--- a/src/homepageExperience/components/steps/nodejs/ExecuteQuery.tsx
+++ b/src/homepageExperience/components/steps/nodejs/ExecuteQuery.tsx
@@ -22,18 +22,13 @@ let fluxQuery = \`from(bucket: "${bucket}")
  |> range(start: -10m)
  |> filter(fn: (r) => r._measurement == "measurement1")\`
 
-queryClient.queryRows(fluxQuery, {
-  next: (row, tableMeta) => {
-    const tableObject = tableMeta.toObject(row)
+async function iterateRows() {
+  for await (const {values, tableMeta} of queryClient.iterateRows(fluxQuery)) {
+    const tableObject = tableMeta.toObject(values)
     console.log(tableObject)
-  },
-  error: (error) => {
-    console.error('\\nError', error)
-  },
-  complete: () => {
-    console.log('\\nSuccess')
-  },
-})`
+  }
+}
+iterateRows()`
 
   return (
     <>
diff --git a/src/writeData/clients/Javascript/execute.example b/src/writeData/clients/Javascript/execute.example
index 6032af2c43..5384950df5 100644
--- a/src/writeData/clients/Javascript/execute.example
+++ b/src/writeData/clients/Javascript/execute.example
@@ -1,17 +1,12 @@
 const queryApi = client.getQueryApi(org)
 
 const query = `<%= query %>`
-queryApi.queryRows(query, {
-  next: (row, tableMeta) => {
-    const o = tableMeta.toObject(row)
+
+async function iterateRows() {
+  for await (const {values, tableMeta} of queryClient.iterateRows(query)) {
+    const o = tableMeta.toObject(values)
     console.log(`${o._time} ${o._measurement}: ${o._field}=${o._value}`)
-  },
-  error: (error) => {
-    console.error(error)
-    console.log('Finished ERROR')
-  },
-  complete: () => {
-    console.log('Finished SUCCESS')
-  },
-})
+  }
+}
+iterateRows()
 
diff --git a/src/writeData/clients/Javascript/executeFull.example b/src/writeData/clients/Javascript/executeFull.example
index 3ff3546d19..1daea928d9 100644
--- a/src/writeData/clients/Javascript/executeFull.example
+++ b/src/writeData/clients/Javascript/executeFull.example
@@ -9,16 +9,11 @@ const client = new InfluxDB({url: '<%= server %>', token: token})
 const queryApi = client.getQueryApi(org)
 
 const query = `<%= query %>`
-queryApi.queryRows(query, {
-  next: (row, tableMeta) => {
-    const o = tableMeta.toObject(row)
+
+async function iterateRows() {
+  for await (const {values, tableMeta} of queryClient.iterateRows(query)) {
+    const o = tableMeta.toObject(values)
     console.log(`${o._time} ${o._measurement}: ${o._field}=${o._value}`)
-  },
-  error: (error) => {
-    console.error(error)
-    console.log('Finished ERROR')
-  },
-  complete: () => {
-    console.log('Finished SUCCESS')
-  },
-})
+  }
+}
+iterateRows()