diff --git a/google-cloud-clients/google-cloud-tasks/src/main/java/com/google/cloud/tasks/v2beta2/stub/CloudTasksStubSettings.java b/google-cloud-clients/google-cloud-tasks/src/main/java/com/google/cloud/tasks/v2beta2/stub/CloudTasksStubSettings.java
index 2889d1f92704..920bd9c4c6a7 100644
--- a/google-cloud-clients/google-cloud-tasks/src/main/java/com/google/cloud/tasks/v2beta2/stub/CloudTasksStubSettings.java
+++ b/google-cloud-clients/google-cloud-tasks/src/main/java/com/google/cloud/tasks/v2beta2/stub/CloudTasksStubSettings.java
@@ -357,7 +357,9 @@ public String extractNextToken(ListQueuesResponse payload) {
 
             @Override
             public Iterable<Queue> extractResources(ListQueuesResponse payload) {
-              return payload.getQueuesList();
+              return payload.getQueuesList() != null
+                  ? payload.getQueuesList()
+                  : ImmutableList.<Queue>of();
             }
           };
 
@@ -391,7 +393,9 @@ public String extractNextToken(ListTasksResponse payload) {
 
             @Override
             public Iterable<Task> extractResources(ListTasksResponse payload) {
-              return payload.getTasksList();
+              return payload.getTasksList() != null
+                  ? payload.getTasksList()
+                  : ImmutableList.<Task>of();
             }
           };
 
diff --git a/google-cloud-clients/google-cloud-tasks/src/main/java/com/google/cloud/tasks/v2beta3/stub/CloudTasksStubSettings.java b/google-cloud-clients/google-cloud-tasks/src/main/java/com/google/cloud/tasks/v2beta3/stub/CloudTasksStubSettings.java
index fcf4f0eaa744..0f666bcb7f42 100644
--- a/google-cloud-clients/google-cloud-tasks/src/main/java/com/google/cloud/tasks/v2beta3/stub/CloudTasksStubSettings.java
+++ b/google-cloud-clients/google-cloud-tasks/src/main/java/com/google/cloud/tasks/v2beta3/stub/CloudTasksStubSettings.java
@@ -324,7 +324,9 @@ public String extractNextToken(ListQueuesResponse payload) {
 
             @Override
             public Iterable<Queue> extractResources(ListQueuesResponse payload) {
-              return payload.getQueuesList();
+              return payload.getQueuesList() != null
+                  ? payload.getQueuesList()
+                  : ImmutableList.<Queue>of();
             }
           };
 
@@ -358,7 +360,9 @@ public String extractNextToken(ListTasksResponse payload) {
 
             @Override
             public Iterable<Task> extractResources(ListTasksResponse payload) {
-              return payload.getTasksList();
+              return payload.getTasksList() != null
+                  ? payload.getTasksList()
+                  : ImmutableList.<Task>of();
             }
           };