diff --git a/libraries/microsoft-agents-hosting-core/microsoft_agents/hosting/core/app/agent_application.py b/libraries/microsoft-agents-hosting-core/microsoft_agents/hosting/core/app/agent_application.py
index f81ac303..bf3e0968 100644
--- a/libraries/microsoft-agents-hosting-core/microsoft_agents/hosting/core/app/agent_application.py
+++ b/libraries/microsoft-agents-hosting-core/microsoft_agents/hosting/core/app/agent_application.py
@@ -903,6 +903,7 @@ def _remove_mentions(self, context: TurnContext):
         if (
             self.options.remove_recipient_mention
             and context.activity.type == ActivityTypes.message
+            and context.activity.text is not None
         ):
             context.activity.text = context.remove_recipient_mention(context.activity)