diff --git a/sdk/core/azure-core-amqp/src/amqp/connection.cpp b/sdk/core/azure-core-amqp/src/amqp/connection.cpp
index e08ffee1e..0d872be1f 100644
--- a/sdk/core/azure-core-amqp/src/amqp/connection.cpp
+++ b/sdk/core/azure-core-amqp/src/amqp/connection.cpp
@@ -661,11 +661,7 @@ namespace Azure { namespace Core { namespace Amqp { namespace _detail {
       try
       {
         Credentials::TokenRequestContext requestContext;
-        bool isSasToken = IsSasCredential();
-        if (isSasToken)
-        {
-          requestContext.MinimumExpiration = std::chrono::minutes(60);
-        }
+
         requestContext.Scopes = m_options.AuthenticationScopes;
         auto accessToken{GetCredential()->GetToken(requestContext, context)};
 
diff --git a/sdk/core/azure-core-amqp/src/amqp/connection_string_credential.cpp b/sdk/core/azure-core-amqp/src/amqp/connection_string_credential.cpp
index 9e35d0c1c..28719f7af 100644
--- a/sdk/core/azure-core-amqp/src/amqp/connection_string_credential.cpp
+++ b/sdk/core/azure-core-amqp/src/amqp/connection_string_credential.cpp
@@ -129,8 +129,9 @@ namespace Azure { namespace Core { namespace Amqp { namespace _internal {
       Context const& context) const
   {
     Credentials::AccessToken rv;
-    rv.ExpiresOn = Azure::DateTime::clock::now() + tokenRequestContext.MinimumExpiration;
+    rv.ExpiresOn = Azure::DateTime::clock::now() + std::chrono::minutes(60);
     rv.Token = GenerateSasToken(static_cast<std::chrono::system_clock::time_point>(rv.ExpiresOn));
+    (void)tokenRequestContext;
     (void)context;
     return rv;
   }