diff --git a/healthconnect/src/main/java/com/example/healthconnect/HealthConnectManager.kt b/healthconnect/src/main/java/com/example/healthconnect/HealthConnectManager.kt
index db9d6024d..3aff3ed63 100644
--- a/healthconnect/src/main/java/com/example/healthconnect/HealthConnectManager.kt
+++ b/healthconnect/src/main/java/com/example/healthconnect/HealthConnectManager.kt
@@ -1138,7 +1138,7 @@ class HealthConnectManager(
                 val records = readResponse.records
                 // Do something with records
                 pageToken = readResponse.pageToken
-            } while (pageToken != null)
+            } while (!pageToken.isNullOrEmpty())
         } catch (quotaError: IllegalStateException) {
             // Backoff
         }