diff --git a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/stub/FirestoreStubSettings.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/stub/FirestoreStubSettings.java
index 36eac47a77c8..43366fcc07c1 100644
--- a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/stub/FirestoreStubSettings.java
+++ b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/stub/FirestoreStubSettings.java
@@ -312,7 +312,9 @@ public String extractNextToken(ListDocumentsResponse payload) {
 
             @Override
             public Iterable<Document> extractResources(ListDocumentsResponse payload) {
-              return payload.getDocumentsList();
+              return payload.getDocumentsList() != null
+                  ? payload.getDocumentsList()
+                  : ImmutableList.<Document>of();
             }
           };
 
@@ -349,7 +351,9 @@ public String extractNextToken(ListCollectionIdsResponse payload) {
 
             @Override
             public Iterable<String> extractResources(ListCollectionIdsResponse payload) {
-              return payload.getCollectionIdsList();
+              return payload.getCollectionIdsList() != null
+                  ? payload.getCollectionIdsList()
+                  : ImmutableList.<String>of();
             }
           };
 
@@ -566,7 +570,7 @@ private static Builder initDefaults(Builder builder) {
       builder
           .runQuerySettings()
           .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("streaming"));
 
       builder
           .listCollectionIdsSettings()