diff --git a/common/util.go b/common/util.go
index ad1bf52cef5..293cb305646 100644
--- a/common/util.go
+++ b/common/util.go
@@ -69,7 +69,7 @@ const (
 
 	frontendHandlerRetryInitialInterval = 200 * time.Millisecond
 	frontendHandlerRetryMaxInterval     = time.Second
-	frontendHandlerRetryMaxAttempts     = 5
+	frontendHandlerRetryMaxAttempts     = 2
 
 	historyHandlerRetryInitialInterval = 50 * time.Millisecond
 	historyHandlerRetryMaxAttempts     = 2