diff --git a/java-spanner/google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudClientExecutor.java b/java-spanner/google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudClientExecutor.java
index 4657149a7cf0..bd6b96219a1c 100644
--- a/java-spanner/google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudClientExecutor.java
+++ b/java-spanner/google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudClientExecutor.java
@@ -2462,14 +2462,10 @@ private Status executeExecuteChangeStreamQuery(
       // For initial partition query (no partition token) we simulate precision of the timestamp
       // in nanoseconds as that's closer inlined with the production client code.
 
-      String startTime =
-          timestampToString(
-              !action.hasPartitionToken(), Timestamps.toMicros(action.getStartTime()));
+      String startTime = timestampToString(false, Timestamps.toMicros(action.getStartTime()));
       String endTime = "null";
       if (action.hasEndTime()) {
-        endTime =
-            timestampToString(
-                !action.hasPartitionToken(), Timestamps.toMicros(action.getEndTime()));
+        endTime = timestampToString(false, Timestamps.toMicros(action.getEndTime()));
       }
       String heartbeat = "null";
       if (action.hasHeartbeatMilliseconds()) {