diff --git a/libraries/microsoft-agents-hosting-aiohttp/microsoft_agents/hosting/aiohttp/app/streaming/streaming_response.py b/libraries/microsoft-agents-hosting-aiohttp/microsoft_agents/hosting/aiohttp/app/streaming/streaming_response.py
index 4c1cff5b..db57858b 100644
--- a/libraries/microsoft-agents-hosting-aiohttp/microsoft_agents/hosting/aiohttp/app/streaming/streaming_response.py
+++ b/libraries/microsoft-agents-hosting-aiohttp/microsoft_agents/hosting/aiohttp/app/streaming/streaming_response.py
@@ -250,10 +250,10 @@ async def wait_for_queue(self) -> None:
             await self._queue_sync
 
     def _set_defaults(self, context: "TurnContext"):
-        if context.activity.channel_id == Channels.ms_teams:
+        if Channels.ms_teams == context.activity.channel_id.channel:
             self._is_streaming_channel = True
             self._interval = 1.0
-        elif context.activity.channel_id == Channels.direct_line:
+        elif Channels.direct_line == context.activity.channel_id.channel:
             self._is_streaming_channel = True
             self._interval = 0.5
         elif context.activity.delivery_mode == DeliveryModes.stream:
@@ -284,6 +284,7 @@ def create_activity():
                     entities=[
                         Entity(
                             type="streaminfo",
+                            stream_id=self._stream_id,
                             stream_type="final",
                             stream_sequence=self._sequence_number,
                         )
diff --git a/libraries/microsoft-agents-hosting-core/microsoft_agents/hosting/core/app/typing_indicator.py b/libraries/microsoft-agents-hosting-core/microsoft_agents/hosting/core/app/typing_indicator.py
index 24b3c0a0..f60d8b45 100644
--- a/libraries/microsoft-agents-hosting-core/microsoft_agents/hosting/core/app/typing_indicator.py
+++ b/libraries/microsoft-agents-hosting-core/microsoft_agents/hosting/core/app/typing_indicator.py
@@ -76,4 +76,3 @@ async def _typing_loop(self, context: TurnContext):
                 await asyncio.sleep(self._intervalSeconds)
         except asyncio.CancelledError:
             logger.debug("Typing indicator loop cancelled")
-            raise