diff --git a/service/frontend/service.go b/service/frontend/service.go
index 78311a39c8e..b9b6d18beb0 100644
--- a/service/frontend/service.go
+++ b/service/frontend/service.go
@@ -307,8 +307,8 @@ func (s *Service) Stop() {
 	// 4. Wait for a second
 	// 5. Stop everything forcefully and return
 
-	requestDrainTime := common.MinDuration(time.Second, s.config.ShutdownDrainDuration())
-	failureDetectionTime := common.MaxDuration(0, s.config.ShutdownDrainDuration()-requestDrainTime)
+	requestDrainTime := common.MaxDuration(time.Second, s.config.ShutdownDrainDuration())
+	failureDetectionTime := 10 * time.Second
 
 	s.GetLogger().Info("ShutdownHandler: Updating rpc health status to ShuttingDown")
 	s.handler.UpdateHealthStatus(HealthStatusShuttingDown)