diff --git a/plugins/catalog-backend-module-ldap/api-report.md b/plugins/catalog-backend-module-ldap/api-report.md
index 35f647ec70..91f70eaa21 100644
--- a/plugins/catalog-backend-module-ldap/api-report.md
+++ b/plugins/catalog-backend-module-ldap/api-report.md
@@ -103,6 +103,15 @@ export class LdapClient {
   // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
   // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
   search(dn: string, options: SearchOptions): Promise<SearchEntry[]>;
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+  // Warning: (ae-forgotten-export) The symbol "SearchCallback" needs to be exported by the entry point index.d.ts
+  searchStreaming(
+    dn: string,
+    options: SearchOptions,
+    f: SearchCallback,
+  ): Promise<void>;
 }
 
 // Warning: (ae-missing-release-tag) "LdapOrgEntityProvider" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
diff --git a/plugins/catalog-backend-module-ldap/src/ldap/client.ts b/plugins/catalog-backend-module-ldap/src/ldap/client.ts
index a36a96b638..048aa40dc1 100644
--- a/plugins/catalog-backend-module-ldap/src/ldap/client.ts
+++ b/plugins/catalog-backend-module-ldap/src/ldap/client.ts
@@ -147,8 +147,8 @@ export class LdapClient {
             reject(new Error('Unable to handle referral'));
           });
 
-          res.on('searchEntry', async entry => {
-            await f(entry);
+          res.on('searchEntry', entry => {
+            f(entry);
           });
 
           res.on('error', e => {
diff --git a/plugins/catalog-backend-module-ldap/src/ldap/read.test.ts b/plugins/catalog-backend-module-ldap/src/ldap/read.test.ts
index 5674c041ab..c4f203c5db 100644
--- a/plugins/catalog-backend-module-ldap/src/ldap/read.test.ts
+++ b/plugins/catalog-backend-module-ldap/src/ldap/read.test.ts
@@ -75,25 +75,20 @@ describe('readLdapUsers', () => {
 
   it('transfers all attributes from a default ldap vendor', async () => {
     client.getVendor.mockResolvedValue(DefaultLdapVendor);
-    client.searchStreaming.mockImplementation(
-      async (_dn, _opts, fn): Promise<void> => {
-        return await new Promise<void>((resolve, _reject) => {
-          fn(
-            searchEntry({
-              uid: ['uid-value'],
-              description: ['description-value'],
-              cn: ['cn-value'],
-              mail: ['mail-value'],
-              avatarUrl: ['avatarUrl-value'],
-              memberOf: ['x', 'y', 'z'],
-              entryDN: ['dn-value'],
-              entryUUID: ['uuid-value'],
-            }),
-          );
-          resolve();
-        });
-      },
-    );
+    client.searchStreaming.mockImplementation(async (_dn, _opts, fn) => {
+      await fn(
+        searchEntry({
+          uid: ['uid-value'],
+          description: ['description-value'],
+          cn: ['cn-value'],
+          mail: ['mail-value'],
+          avatarUrl: ['avatarUrl-value'],
+          memberOf: ['x', 'y', 'z'],
+          entryDN: ['dn-value'],
+          entryUUID: ['uuid-value'],
+        }),
+      );
+    });
     const config: UserConfig = {
       dn: 'ddd',
       options: {},
@@ -136,44 +131,25 @@ describe('readLdapUsers', () => {
 
   it('transfers all attributes from Microsoft Active Directory', async () => {
     client.getVendor.mockResolvedValue(ActiveDirectoryVendor);
-    client.searchStreaming.mockImplementation(
-      async (_dn, _opts, fn): Promise<void> => {
-        return await new Promise<void>((resolve, _reject) => {
-          fn(
-            searchEntry({
-              uid: ['uid-value'],
-              description: ['description-value'],
-              cn: ['cn-value'],
-              mail: ['mail-value'],
-              avatarUrl: ['avatarUrl-value'],
-              memberOf: ['x', 'y', 'z'],
-              distinguishedName: ['dn-value'],
-              objectGUID: [
-                Buffer.from([
-                  68,
-                  2,
-                  125,
-                  190,
-                  209,
-                  0,
-                  94,
-                  73,
-                  133,
-                  33,
-                  230,
-                  174,
-                  234,
-                  195,
-                  160,
-                  152,
-                ]),
-              ],
-            }),
-          );
-          resolve();
-        });
-      },
-    );
+    client.searchStreaming.mockImplementation(async (_dn, _opts, fn) => {
+      await fn(
+        searchEntry({
+          uid: ['uid-value'],
+          description: ['description-value'],
+          cn: ['cn-value'],
+          mail: ['mail-value'],
+          avatarUrl: ['avatarUrl-value'],
+          memberOf: ['x', 'y', 'z'],
+          distinguishedName: ['dn-value'],
+          objectGUID: [
+            Buffer.from([
+              68, 2, 125, 190, 209, 0, 94, 73, 133, 33, 230, 174, 234, 195, 160,
+              152,
+            ]),
+          ],
+        }),
+      );
+    });
     const config: UserConfig = {
       dn: 'ddd',
       options: {},
@@ -225,26 +201,21 @@ describe('readLdapGroups', () => {
 
   it('transfers all attributes from a default ldap vendor', async () => {
     client.getVendor.mockResolvedValue(DefaultLdapVendor);
-    client.searchStreaming.mockImplementation(
-      async (_dn, _opts, fn): Promise<void> => {
-        return await new Promise<void>((resolve, _reject) => {
-          fn(
-            searchEntry({
-              cn: ['cn-value'],
-              description: ['description-value'],
-              tt: ['type-value'],
-              mail: ['mail-value'],
-              avatarUrl: ['avatarUrl-value'],
-              memberOf: ['x', 'y', 'z'],
-              member: ['e', 'f', 'g'],
-              entryDN: ['dn-value'],
-              entryUUID: ['uuid-value'],
-            }),
-          );
-          resolve();
-        });
-      },
-    );
+    client.searchStreaming.mockImplementation(async (_dn, _opts, fn) => {
+      await fn(
+        searchEntry({
+          cn: ['cn-value'],
+          description: ['description-value'],
+          tt: ['type-value'],
+          mail: ['mail-value'],
+          avatarUrl: ['avatarUrl-value'],
+          memberOf: ['x', 'y', 'z'],
+          member: ['e', 'f', 'g'],
+          entryDN: ['dn-value'],
+          entryUUID: ['uuid-value'],
+        }),
+      );
+    });
     const config: GroupConfig = {
       dn: 'ddd',
       options: {},
@@ -295,45 +266,26 @@ describe('readLdapGroups', () => {
   });
   it('transfers all attributes from Microsoft Active Directory', async () => {
     client.getVendor.mockResolvedValue(ActiveDirectoryVendor);
-    client.searchStreaming.mockImplementation(
-      async (_dn, _opts, fn): Promise<void> => {
-        return await new Promise<void>((resolve, _reject) => {
-          fn(
-            searchEntry({
-              cn: ['cn-value'],
-              description: ['description-value'],
-              tt: ['type-value'],
-              mail: ['mail-value'],
-              avatarUrl: ['avatarUrl-value'],
-              memberOf: ['x', 'y', 'z'],
-              member: ['e', 'f', 'g'],
-              distinguishedName: ['dn-value'],
-              objectGUID: [
-                Buffer.from([
-                  68,
-                  2,
-                  125,
-                  190,
-                  209,
-                  0,
-                  94,
-                  73,
-                  133,
-                  33,
-                  230,
-                  174,
-                  234,
-                  195,
-                  160,
-                  152,
-                ]),
-              ],
-            }),
-          );
-          resolve();
-        });
-      },
-    );
+    client.searchStreaming.mockImplementation(async (_dn, _opts, fn) => {
+      await fn(
+        searchEntry({
+          cn: ['cn-value'],
+          description: ['description-value'],
+          tt: ['type-value'],
+          mail: ['mail-value'],
+          avatarUrl: ['avatarUrl-value'],
+          memberOf: ['x', 'y', 'z'],
+          member: ['e', 'f', 'g'],
+          distinguishedName: ['dn-value'],
+          objectGUID: [
+            Buffer.from([
+              68, 2, 125, 190, 209, 0, 94, 73, 133, 33, 230, 174, 234, 195, 160,
+              152,
+            ]),
+          ],
+        }),
+      );
+    });
     const config: GroupConfig = {
       dn: 'ddd',
       options: {},