diff --git a/cmd/cli/job/executions.go b/cmd/cli/job/executions.go
index bff61610fd..d3c3f162ef 100644
--- a/cmd/cli/job/executions.go
+++ b/cmd/cli/job/executions.go
@@ -148,10 +148,10 @@ func (o *ExecutionOptions) run(cmd *cobra.Command, args []string, api client.API
 	response, err := api.Jobs().Executions(ctx, &apimodels.ListJobExecutionsRequest{
 		JobID: jobID,
 		BaseListRequest: apimodels.BaseListRequest{
-			Limit:     o.ListOptions.Limit,
-			NextToken: o.ListOptions.NextToken,
-			OrderBy:   o.ListOptions.OrderBy,
-			Reverse:   o.ListOptions.Reverse,
+			Limit:     o.Limit,
+			NextToken: o.NextToken,
+			OrderBy:   o.OrderBy,
+			Reverse:   o.Reverse,
 		},
 	})
 	if err != nil {
diff --git a/cmd/cli/job/history.go b/cmd/cli/job/history.go
index e03afcbd4f..90da87e6e8 100644
--- a/cmd/cli/job/history.go
+++ b/cmd/cli/job/history.go
@@ -103,10 +103,10 @@ func (o *HistoryOptions) run(cmd *cobra.Command, args []string, api client.API)
 		EventType:   o.EventType,
 		ExecutionID: o.ExecutionID,
 		BaseListRequest: apimodels.BaseListRequest{
-			Limit:     o.ListOptions.Limit,
-			NextToken: o.ListOptions.NextToken,
-			OrderBy:   o.ListOptions.OrderBy,
-			Reverse:   o.ListOptions.Reverse,
+			Limit:     o.Limit,
+			NextToken: o.NextToken,
+			OrderBy:   o.OrderBy,
+			Reverse:   o.Reverse,
 		},
 	})
 	if err != nil {
diff --git a/cmd/cli/job/list.go b/cmd/cli/job/list.go
index d080aaee16..bf3296c251 100644
--- a/cmd/cli/job/list.go
+++ b/cmd/cli/job/list.go
@@ -143,10 +143,10 @@ func (o *ListOptions) run(cmd *cobra.Command, api client.API) error {
 	response, err := api.Jobs().List(ctx, &apimodels.ListJobsRequest{
 		Labels: labelRequirements,
 		BaseListRequest: apimodels.BaseListRequest{
-			Limit:     o.ListOptions.Limit,
-			NextToken: o.ListOptions.NextToken,
-			OrderBy:   o.ListOptions.OrderBy,
-			Reverse:   o.ListOptions.Reverse,
+			Limit:     o.Limit,
+			NextToken: o.NextToken,
+			OrderBy:   o.OrderBy,
+			Reverse:   o.Reverse,
 		},
 	})
 	if err != nil {
diff --git a/cmd/cli/node/list.go b/cmd/cli/node/list.go
index 16150943fe..2187fc4104 100644
--- a/cmd/cli/node/list.go
+++ b/cmd/cli/node/list.go
@@ -110,10 +110,10 @@ func (o *ListOptions) run(cmd *cobra.Command, api client.API) error {
 		FilterByApproval: o.FilterByApproval,
 		FilterByStatus:   o.FilterByStatus,
 		BaseListRequest: apimodels.BaseListRequest{
-			Limit:     o.ListOptions.Limit,
-			NextToken: o.ListOptions.NextToken,
-			OrderBy:   o.ListOptions.OrderBy,
-			Reverse:   o.ListOptions.Reverse,
+			Limit:     o.Limit,
+			NextToken: o.NextToken,
+			OrderBy:   o.OrderBy,
+			Reverse:   o.Reverse,
 		},
 	})
 	if err != nil {