diff --git a/sdk/eventhub/azure-eventhub/CHANGELOG.md b/sdk/eventhub/azure-eventhub/CHANGELOG.md
index d26f1e456819..9b9d274b9d0a 100644
--- a/sdk/eventhub/azure-eventhub/CHANGELOG.md
+++ b/sdk/eventhub/azure-eventhub/CHANGELOG.md
@@ -18,6 +18,9 @@ This version and all future versions will require Python 3.7+. Python 2.7 and 3.
 
 ### Other Changes
 
+- Improved token refresh timing to prevent potentially blocking main flow when the token is about to get expired soon.
+- Updated uAMQP dependency to 1.5.0.
+
 ## 5.6.1 (2021-10-06)
 
 ### Bugs Fixed
diff --git a/sdk/eventhub/azure-eventhub/azure/eventhub/_client_base.py b/sdk/eventhub/azure-eventhub/azure/eventhub/_client_base.py
index 7055f99ed30e..aa0c81519c14 100644
--- a/sdk/eventhub/azure-eventhub/azure/eventhub/_client_base.py
+++ b/sdk/eventhub/azure-eventhub/azure/eventhub/_client_base.py
@@ -341,6 +341,7 @@ def _create_auth(self):
             custom_endpoint_hostname=self._config.custom_endpoint_hostname,
             port=self._config.connection_port,
             verify=self._config.connection_verify,
+            refresh_window=300,
         )
 
     def _close_connection(self):
diff --git a/sdk/eventhub/azure-eventhub/azure/eventhub/aio/_client_base_async.py b/sdk/eventhub/azure-eventhub/azure/eventhub/aio/_client_base_async.py
index ffbf66b47db1..ee312ead305c 100644
--- a/sdk/eventhub/azure-eventhub/azure/eventhub/aio/_client_base_async.py
+++ b/sdk/eventhub/azure-eventhub/azure/eventhub/aio/_client_base_async.py
@@ -205,6 +205,7 @@ async def _create_auth_async(self) -> authentication.JWTTokenAsync:
                 custom_endpoint_hostname=self._config.custom_endpoint_hostname,
                 port=self._config.connection_port,
                 verify=self._config.connection_verify,
+                refresh_window=300,
             )
             await auth.update_token()
             return auth
diff --git a/sdk/eventhub/azure-eventhub/setup.py b/sdk/eventhub/azure-eventhub/setup.py
index dc5a7573f899..73c984c4c4e7 100644
--- a/sdk/eventhub/azure-eventhub/setup.py
+++ b/sdk/eventhub/azure-eventhub/setup.py
@@ -69,6 +69,6 @@
     packages=find_packages(exclude=exclude_packages),
     install_requires=[
         "azure-core<2.0.0,>=1.14.0",
-        "uamqp>=1.4.3,<2.0.0",
+        "uamqp>=1.5.0,<2.0.0",
     ]
 )
diff --git a/sdk/servicebus/azure-servicebus/CHANGELOG.md b/sdk/servicebus/azure-servicebus/CHANGELOG.md
index a6f05e1918a4..407301748079 100644
--- a/sdk/servicebus/azure-servicebus/CHANGELOG.md
+++ b/sdk/servicebus/azure-servicebus/CHANGELOG.md
@@ -18,6 +18,9 @@ This version and all future versions will require Python 3.7+. Python 2.7 and 3.
 
 ### Other Changes
 
+- Improved token refresh timing to prevent potentially blocking main flow when the token is about to get expired soon.
+- Updated uAMQP dependency to 1.5.0.
+
 ## 7.4.0 (2021-11-09)
 
 ### Features Added
diff --git a/sdk/servicebus/azure-servicebus/azure/servicebus/_common/utils.py b/sdk/servicebus/azure-servicebus/azure/servicebus/_common/utils.py
index 6505b09058f6..8c2783d96bd3 100644
--- a/sdk/servicebus/azure-servicebus/azure/servicebus/_common/utils.py
+++ b/sdk/servicebus/azure-servicebus/azure/servicebus/_common/utils.py
@@ -184,6 +184,7 @@ def create_authentication(client):
         timeout=client._config.auth_timeout,
         http_proxy=client._config.http_proxy,
         transport_type=client._config.transport_type,
+        refresh_window=300,
     )
 
 
diff --git a/sdk/servicebus/azure-servicebus/azure/servicebus/aio/_async_utils.py b/sdk/servicebus/azure-servicebus/azure/servicebus/aio/_async_utils.py
index 54f4397697b7..4a7864767a2c 100644
--- a/sdk/servicebus/azure-servicebus/azure/servicebus/aio/_async_utils.py
+++ b/sdk/servicebus/azure-servicebus/azure/servicebus/aio/_async_utils.py
@@ -66,6 +66,7 @@ async def create_authentication(client):
         timeout=client._config.auth_timeout,
         http_proxy=client._config.http_proxy,
         transport_type=client._config.transport_type,
+        refresh_window=300,
     )
 
 
diff --git a/sdk/servicebus/azure-servicebus/setup.py b/sdk/servicebus/azure-servicebus/setup.py
index 25086e099b0f..2d046403730a 100644
--- a/sdk/servicebus/azure-servicebus/setup.py
+++ b/sdk/servicebus/azure-servicebus/setup.py
@@ -63,7 +63,7 @@
         'azure',
     ]),
     install_requires=[
-        "uamqp>=1.4.3,<2.0.0",
+        "uamqp>=1.5.0,<2.0.0",
         'azure-common~=1.1',
         'msrest>=0.6.17,<2.0.0',
         'azure-core<2.0.0,>=1.14.0',
diff --git a/shared_requirements.txt b/shared_requirements.txt
index b5c8b4fc5a4b..0e98e4db3c8f 100644
--- a/shared_requirements.txt
+++ b/shared_requirements.txt
@@ -118,7 +118,7 @@ msrest>=0.6.21
 msrestazure<2.0.0,>=0.4.32
 azure-mgmt-core<2.0.0,>=1.2.0
 requests>=2.18.4
-uamqp~=1.2.0
+uamqp~=1.5.0
 enum34>=1.0.4
 certifi>=2017.4.17
 aiohttp>=3.0
@@ -174,9 +174,9 @@ opentelemetry-sdk<2.0.0,>=1.5.0,!=1.10a0
 #override azure-eventhub-checkpointstoreblob-aio azure-core<2.0.0,>=1.20.1
 #override azure-eventhub-checkpointstoreblob-aio aiohttp<4.0,>=3.0
 #override azure-eventhub-checkpointstoretable azure-core<2.0.0,>=1.14.0
-#override azure-eventhub uamqp>=1.4.3,<2.0.0
+#override azure-eventhub uamqp>=1.5.0,<2.0.0
 #override azure-appconfiguration msrest>=0.6.10
-#override azure-servicebus uamqp>=1.4.3,<2.0.0
+#override azure-servicebus uamqp>=1.5.0,<2.0.0
 #override azure-servicebus msrest>=0.6.17,<2.0.0
 #override azure-servicebus azure-core<2.0.0,>=1.14.0
 #override azure-synapse-accesscontrol azure-core>=1.20.0,<2.0.0