diff --git a/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStubSettings.java b/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStubSettings.java
index 652a428be167..2f591436e728 100644
--- a/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStubSettings.java
+++ b/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStubSettings.java
@@ -421,7 +421,9 @@ public String extractNextToken(ListAppProfilesResponse payload) {
 
             @Override
             public Iterable<AppProfile> extractResources(ListAppProfilesResponse payload) {
-              return payload.getAppProfilesList();
+              return payload.getAppProfilesList() != null
+                  ? payload.getAppProfilesList()
+                  : ImmutableList.<AppProfile>of();
             }
           };
 
diff --git a/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStubSettings.java b/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStubSettings.java
index ad6034d6c922..4ee935113e58 100644
--- a/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStubSettings.java
+++ b/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStubSettings.java
@@ -347,7 +347,9 @@ public String extractNextToken(ListTablesResponse payload) {
 
             @Override
             public Iterable<Table> extractResources(ListTablesResponse payload) {
-              return payload.getTablesList();
+              return payload.getTablesList() != null
+                  ? payload.getTablesList()
+                  : ImmutableList.<Table>of();
             }
           };
 
@@ -381,7 +383,9 @@ public String extractNextToken(ListSnapshotsResponse payload) {
 
             @Override
             public Iterable<Snapshot> extractResources(ListSnapshotsResponse payload) {
-              return payload.getSnapshotsList();
+              return payload.getSnapshotsList() != null
+                  ? payload.getSnapshotsList()
+                  : ImmutableList.<Snapshot>of();
             }
           };