diff --git a/azure/durable_functions/models/DurableOrchestrationClient.py b/azure/durable_functions/models/DurableOrchestrationClient.py
index 6b473c2c..294e7fda 100644
--- a/azure/durable_functions/models/DurableOrchestrationClient.py
+++ b/azure/durable_functions/models/DurableOrchestrationClient.py
@@ -638,7 +638,7 @@ def _get_raise_event_url(
             self, instance_id: str, event_name: str,
             task_hub_name: Optional[str], connection_name: Optional[str]) -> str:
         request_url = f'{self._orchestration_bindings.rpc_base_url}' \
-                      f'instances/{instance_id}/raiseEvent/{event_name}'
+                      f'instances/{instance_id}/raiseEvent/{quote(event_name, safe="")}'
 
         query: List[str] = []
         if task_hub_name:
diff --git a/azure/durable_functions/models/DurableOrchestrationContext.py b/azure/durable_functions/models/DurableOrchestrationContext.py
index afbc7db3..ddb641cf 100644
--- a/azure/durable_functions/models/DurableOrchestrationContext.py
+++ b/azure/durable_functions/models/DurableOrchestrationContext.py
@@ -1,4 +1,5 @@
 from collections import defaultdict
+from urllib.parse import quote
 from azure.durable_functions.models.actions.SignalEntityAction import SignalEntityAction
 from azure.durable_functions.models.actions.CallEntityAction import CallEntityAction
 from azure.durable_functions.models.Task import TaskBase, TimerTask
@@ -583,7 +584,7 @@ def wait_for_external_event(self, name: str) -> TaskBase:
             Task to wait for the event
         """
         action = WaitForExternalEventAction(name)
-        task = self._generate_task(action, id_=name)
+        task = self._generate_task(action, id_=quote(name, safe=""))
         return task
 
     def continue_as_new(self, input_: Any):