diff --git a/src/services/gsuite-directory.service.ts b/src/services/gsuite-directory.service.ts
index c491588e..895c657b 100644
--- a/src/services/gsuite-directory.service.ts
+++ b/src/services/gsuite-directory.service.ts
@@ -157,7 +157,12 @@ export class GSuiteDirectoryService extends BaseDirectoryService implements IDir
     // eslint-disable-next-line
     while (true) {
       this.logService.info("Querying groups - nextPageToken:" + nextPageToken);
-      const p = Object.assign({ query: query, pageToken: nextPageToken }, this.authParams);
+      let p = null;
+      if (query == null) {
+        p = Object.assign({ pageToken: nextPageToken }, this.authParams);
+      } else {
+        p = Object.assign({ query: query, pageToken: nextPageToken }, this.authParams);
+      }
       const res = await this.service.groups.list(p);
       if (res.status !== 200) {
         throw new Error("Group list API failed: " + res.statusText);