diff --git a/src/app/tabs/dashboard.component.ts b/src/app/tabs/dashboard.component.ts
index 56874e41..cd7c0610 100644
--- a/src/app/tabs/dashboard.component.ts
+++ b/src/app/tabs/dashboard.component.ts
@@ -131,7 +131,7 @@ export class DashboardComponent implements OnInit, OnDestroy {
                 this.sort(this.simGroups);
                 for (const g of this.simGroups) {
                     if (g.userMemberExternalIds == null) {
-                        return;
+                        continue;
                     }
 
                     for (const uid of g.userMemberExternalIds) {
diff --git a/src/services/azure-directory.service.ts b/src/services/azure-directory.service.ts
index c3b7f86a..0da5d8f0 100644
--- a/src/services/azure-directory.service.ts
+++ b/src/services/azure-directory.service.ts
@@ -88,12 +88,12 @@ export class AzureDirectoryService extends BaseDirectoryService implements Direc
                 for (const user of users) {
                     const entry = this.buildUser(user);
                     if (this.filterOutResult(setFilter, entry.email)) {
-                        return;
+                        continue;
                     }
 
                     if (!entry.disabled && !entry.deleted &&
                         (entry.email == null || entry.email.indexOf('#') > -1)) {
-                        return;
+                        continue;
                     }
 
                     entries.push(entry);
@@ -158,7 +158,7 @@ export class AzureDirectoryService extends BaseDirectoryService implements Direc
                     for (const group of groups) {
                         if (getFullResults) {
                             if (this.filterOutResult(setFilter, group.displayName)) {
-                                return;
+                                continue;
                             }
 
                             const entry = await this.buildGroup(group);
@@ -194,7 +194,7 @@ export class AzureDirectoryService extends BaseDirectoryService implements Direc
             if (allGroups != null) {
                 for (const group of allGroups) {
                     if (this.filterOutResult(setFilter, group.displayName)) {
-                        return;
+                        continue;
                     }
 
                     const entry = await this.buildGroup(group);
diff --git a/src/services/gsuite-directory.service.ts b/src/services/gsuite-directory.service.ts
index ac596ac6..337b7ee3 100644
--- a/src/services/gsuite-directory.service.ts
+++ b/src/services/gsuite-directory.service.ts
@@ -82,7 +82,7 @@ export class GSuiteDirectoryService extends BaseDirectoryService implements Dire
         if (res.data.users != null) {
             for (const user of res.data.users) {
                 if (this.filterOutResult(filter, user.primaryEmail)) {
-                    return;
+                    continue;
                 }
 
                 const entry = this.buildUser(user, false);
@@ -102,7 +102,7 @@ export class GSuiteDirectoryService extends BaseDirectoryService implements Dire
         if (delRes.data.users != null) {
             for (const user of delRes.data.users) {
                 if (this.filterOutResult(filter, user.primaryEmail)) {
-                    return;
+                    continue;
                 }
 
                 const entry = this.buildUser(user, true);
@@ -165,10 +165,10 @@ export class GSuiteDirectoryService extends BaseDirectoryService implements Dire
         if (memRes.data.members != null) {
             for (const member of memRes.data.members) {
                 if (member.role.toLowerCase() !== 'member') {
-                    return;
+                    continue;
                 }
                 if (member.status.toLowerCase() !== 'active') {
-                    return;
+                    continue;
                 }
 
                 if (member.type.toLowerCase() === 'user') {