diff --git a/packages/basic.gblib/services/SystemKeywords.ts b/packages/basic.gblib/services/SystemKeywords.ts
index 1289f9ce..21471f20 100644
--- a/packages/basic.gblib/services/SystemKeywords.ts
+++ b/packages/basic.gblib/services/SystemKeywords.ts
@@ -2155,8 +2155,8 @@ export class SystemKeywords {
             let page = 0, pageSize = 1000;
             let count = 0;
 
-            do {
-              
+            while (page === 0 || count !== pageSize) {
+
               rows = [
                 await t.findAll(
                   paginate(
@@ -2169,7 +2169,7 @@ export class SystemKeywords {
 
               count = rows.length;
 
-            } while (count !== 1000)
+            }
           },
           {
             retries: 5,