From a5be434f0cc25aa6fb0c4620cad8d8961ac953b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20My=C5=9Bliwiec?= <mail@kamilmysliwiec.com>
Date: Wed, 31 Aug 2022 09:55:22 +0200
Subject: [PATCH] fix(microservices): multiple scoped event handlers issue
 #10184

---
 packages/microservices/listeners-controller.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/microservices/listeners-controller.ts b/packages/microservices/listeners-controller.ts
index df275cb112c..5c379768864 100644
--- a/packages/microservices/listeners-controller.ts
+++ b/packages/microservices/listeners-controller.ts
@@ -200,7 +200,13 @@ export class ListenersController {
           wrapper.id,
           defaultCallMetadata,
         );
-        requestScopedHandler.next?.(dataOrContextHost, ...args);
+        const returnedValueWrapper = requestScopedHandler.next?.(
+          dataOrContextHost,
+          ...args,
+        );
+        returnedValueWrapper?.then(returnedValue =>
+          this.connectIfStream(returnedValue as Observable<unknown>),
+        );
         return proxy(...args);
       } catch (err) {
         let exceptionFilter = this.exceptionFiltersCache.get(