diff --git a/auth/conn_reauth_credentials_listener.go b/auth/conn_reauth_credentials_listener.go
index 3cd42c89..486d69ab 100644
--- a/auth/conn_reauth_credentials_listener.go
+++ b/auth/conn_reauth_credentials_listener.go
@@ -13,10 +13,18 @@ import (
 // - reAuth: a function that takes the new credentials and returns an error if any.
 // - onErr: a function that takes an error and handles it.
 // - conn: the connection to re-authenticate.
+// - checkUsableTimeout: the timeout to wait for the connection to be usable - default is 1 second.
 type ConnReAuthCredentialsListener struct {
+	// reAuth is called when the credentials are updated.
 	reAuth func(conn *pool.Conn, credentials Credentials) error
-	onErr  func(conn *pool.Conn, err error)
-	conn   *pool.Conn
+	// onErr is called when an error occurs.
+	onErr func(conn *pool.Conn, err error)
+	// conn is the connection to re-authenticate.
+	conn *pool.Conn
+	// checkUsableTimeout is the timeout to wait for the connection to be usable
+	// when the credentials are updated.
+	// default is 1 second
+	checkUsableTimeout time.Duration
 }
 
 // OnNext is called when the credentials are updated.
@@ -32,7 +40,9 @@ func (c *ConnReAuthCredentialsListener) OnNext(credentials Credentials) {
 	}
 
 	var err error
-	timeout := time.After(1 * time.Second)
+
+	// this hard-coded timeout is not ideal
+	timeout := time.After(c.checkUsableTimeout)
 	// wait for the connection to be usable
 	// this is important because the connection pool may be in the process of reconnecting the connection
 	// and we don't want to interfere with that process
@@ -68,15 +78,22 @@ func (c *ConnReAuthCredentialsListener) OnError(err error) {
 	c.onErr(c.conn, err)
 }
 
+// SetCheckUsableTimeout sets the timeout for the connection to be usable.
+func (c *ConnReAuthCredentialsListener) SetCheckUsableTimeout(timeout time.Duration) {
+	c.checkUsableTimeout = timeout
+}
+
 // NewConnReAuthCredentialsListener creates a new ConnReAuthCredentialsListener.
 // Implements the auth.CredentialsListener interface.
 func NewConnReAuthCredentialsListener(conn *pool.Conn, reAuth func(conn *pool.Conn, credentials Credentials) error, onErr func(conn *pool.Conn, err error)) *ConnReAuthCredentialsListener {
 	return &ConnReAuthCredentialsListener{
-		conn:   conn,
-		reAuth: reAuth,
-		onErr:  onErr,
+		conn:               conn,
+		reAuth:             reAuth,
+		onErr:              onErr,
+		checkUsableTimeout: 1 * time.Second,
 	}
 }
 
+
 // Ensure ConnReAuthCredentialsListener implements the CredentialsListener interface.
 var _ CredentialsListener = (*ConnReAuthCredentialsListener)(nil)
diff --git a/error.go b/error.go
index be9cf1a2..7273313b 100644
--- a/error.go
+++ b/error.go
@@ -108,12 +108,12 @@ func isRedisError(err error) bool {
 
 func isBadConn(err error, allowTimeout bool, addr string) bool {
 	switch err {
-	case nil:
-		return false
-	case context.Canceled, context.DeadlineExceeded:
-		return true
+		case nil:
+			return false
+		case context.Canceled, context.DeadlineExceeded:
+			return true
 		case pool.ErrConnUnusableTimeout:
-		return true
+			return true
 	}
 
 	if isRedisError(err) {
diff --git a/redis.go b/redis.go
index 89a12e61..57b41728 100644
--- a/redis.go
+++ b/redis.go
@@ -319,6 +319,12 @@ func (c *baseClient) connReAuthCredentialsListener(poolCn *pool.Conn) (auth.Cred
 		c.reAuthConnection(),
 		c.onAuthenticationErr(),
 	)
+	// main case where the connection can be stuck in the listener for a long time is when we have a handoff
+	// so we set the checkUsableTimeout to the handoff timeout if maintnotifications are enabled
+	// the default timeout if no maintnotifications config is provided is 1 second
+	if c.opt.MaintNotificationsConfig != nil && c.opt.MaintNotificationsConfig.Mode != maintnotifications.ModeDisabled {
+		newCredListener.SetCheckUsableTimeout(c.opt.MaintNotificationsConfig.HandoffTimeout)
+	}
 	c.credListeners[poolCn] = newCredListener
 	return newCredListener, func() {
 		c.removeCredListener(poolCn)