diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStub.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStub.java
index 580f0a1ae9..a1100231fa 100644
--- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStub.java
+++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStub.java
@@ -586,7 +586,8 @@ public <RowT> UnaryCallable<Query, RowT> createReadRowCallable(RowAdapter<RowT>
               ServerStreamingCallSettings.<ReadRowsRequest, Row>newBuilder()
                   .setRetryableCodes(settings.readRowSettings().getRetryableCodes())
                   .setRetrySettings(settings.readRowSettings().getRetrySettings())
-                  .setIdleTimeout(settings.readRowSettings().getRetrySettings().getTotalTimeout())
+                  .setIdleTimeoutDuration(Duration.ZERO)
+                  .setWaitTimeoutDuration(Duration.ZERO)
                   .build(),
               rowAdapter,
               new SimpleStreamResumptionStrategy<>());