diff --git a/src/common/utils/with-error-suppression/with-error-suppression.test.ts b/src/common/utils/with-error-suppression/with-error-suppression.test.ts
index dc15762721..db4909fd55 100644
--- a/src/common/utils/with-error-suppression/with-error-suppression.test.ts
+++ b/src/common/utils/with-error-suppression/with-error-suppression.test.ts
@@ -58,8 +58,8 @@ describe("with-error-suppression", () => {
   });
 
   describe("given decorated async function", () => {
-    let decorated: (a: string, b: string) => Promise<void>;
-    let toBeDecorated: AsyncFnMock<typeof decorated>;
+    let decorated: (a: string, b: string) => Promise<number> | Promise<void>;
+    let toBeDecorated: AsyncFnMock<(a: string, b: string) => number>;
 
     beforeEach(() => {
       toBeDecorated = asyncFn();
@@ -68,7 +68,7 @@ describe("with-error-suppression", () => {
     });
 
     describe("when called", () => {
-      let returnValuePromise: Promise<void>;
+      let returnValuePromise: Promise<number> | Promise<void>;
 
       beforeEach(() => {
         returnValuePromise = decorated("some-parameter", "some-other-parameter");
@@ -92,12 +92,12 @@ describe("with-error-suppression", () => {
         expect(returnValue).toBeUndefined();
       });
 
-      it("when call resolves, resolves with nothing", async () => {
-        await toBeDecorated.resolve(undefined);
+      it("when call resolves, resolves with the value", async () => {
+        await toBeDecorated.resolve(42);
 
         const returnValue = await returnValuePromise;
 
-        expect(returnValue).toBeUndefined();
+        expect(returnValue).toBe(42);
       });
     });
   });
diff --git a/src/common/utils/with-error-suppression/with-error-suppression.ts b/src/common/utils/with-error-suppression/with-error-suppression.ts
index 73d7e8b64c..657ed13c16 100644
--- a/src/common/utils/with-error-suppression/with-error-suppression.ts
+++ b/src/common/utils/with-error-suppression/with-error-suppression.ts
@@ -4,8 +4,8 @@
  */
 import { noop } from "lodash/fp";
 
-export function withErrorSuppression<TDecorated extends (...args: any[]) => Promise<void>>(toBeDecorated: TDecorated): (...args: Parameters<TDecorated>) => Promise<void>;
-export function withErrorSuppression<TDecorated extends (...args: any[]) => void>(toBeDecorated: TDecorated): (...args: Parameters<TDecorated>) => void;
+export function withErrorSuppression<TDecorated extends (...args: any[]) => Promise<any>>(toBeDecorated: TDecorated): (...args: Parameters<TDecorated>) => ReturnType<TDecorated> | Promise<void>;
+export function withErrorSuppression<TDecorated extends (...args: any[]) => any>(toBeDecorated: TDecorated): (...args: Parameters<TDecorated>) => ReturnType<TDecorated> | void;
 
 export function withErrorSuppression(toBeDecorated: any) {
   return (...args: any[]) => {