diff --git a/Firestore/src/Query.php b/Firestore/src/Query.php
index 9cb1f1f305ff..a0732593bcf9 100644
--- a/Firestore/src/Query.php
+++ b/Firestore/src/Query.php
@@ -156,7 +156,10 @@ public function __construct(
      */
     public function documents(array $options = [])
     {
-        $maxRetries = $this->pluck('maxRetries', $options, false) ?: FirestoreClient::MAX_RETRIES;
+        $maxRetries = $this->pluck('maxRetries', $options, false);
+        $maxRetries = $maxRetries === null
+            ? FirestoreClient::MAX_RETRIES
+            : $maxRetries;
 
         $rows = (new ExponentialBackoff($maxRetries))->execute(function () use ($options) {
             $generator = $this->connection->runQuery([
@@ -212,6 +215,8 @@ public function documents(array $options = [])
      * list of field paths to return, or use an empty list to only return the
      * references of matching documents.
      *
+     * Subsequent calls to this method will override previous values.
+     *
      * Example:
      * ```
      * $query = $query->select(['firstName']);
@@ -241,7 +246,7 @@ public function select(array $fieldPaths)
             'select' => [
                 'fields' => $fields
             ]
-        ]);
+        ], true);
     }
 
     /**
diff --git a/Firestore/tests/Unit/QueryTest.php b/Firestore/tests/Unit/QueryTest.php
index 95afb8cc73c3..de2e81e6f663 100644
--- a/Firestore/tests/Unit/QueryTest.php
+++ b/Firestore/tests/Unit/QueryTest.php
@@ -95,7 +95,7 @@ public function testDocuments()
 
         $this->query->___setProperty('connection', $this->connection->reveal());
 
-        $res = $this->query->documents();
+        $res = $this->query->documents(['maxRetries' => 0]);
         $this->assertContainsOnlyInstancesOf(DocumentSnapshot::class, $res);
         $this->assertCount(1, $res->rows());
 
@@ -145,7 +145,6 @@ public function testSelect()
 
         $this->runAndAssert(function (Query $q) use ($paths) {
             $res = $q->select($paths);
-            $res = $res->select(['users.dan']);
 
             return $res;
         }, [
@@ -156,6 +155,29 @@ public function testSelect()
                     'fields' => [
                         [ 'fieldPath' => 'users.john' ],
                         [ 'fieldPath' => 'users.dave' ],
+                    ]
+                ]
+            ]
+        ]);
+    }
+
+    public function testSelectOverride()
+    {
+        $paths = [
+            'users.john',
+            'users.dave'
+        ];
+
+        $this->runAndAssert(function (Query $q) use ($paths) {
+            $res = $q->select($paths);
+            $res = $res->select(['users.dan']);
+            return $res;
+        }, [
+            'parent' => self::PARENT,
+            'structuredQuery' => [
+                'from' => $this->queryFrom(),
+                'select' => [
+                    'fields' => [
                         [ 'fieldPath' => 'users.dan' ],
                     ]
                 ]