diff --git a/internal/gitaly/server/server.go b/internal/gitaly/server/server.go
index bd373b87aba5285721b7c3132773599a0b96e289..fd39ec9ab1a9fa95b0863b91b95a43d6bdecc3f6 100644
--- a/internal/gitaly/server/server.go
+++ b/internal/gitaly/server/server.go
@@ -187,7 +187,6 @@ func (s *GitalyServerFactory) New(external, secure bool, opts ...Option) (*grpc.
 		grpc.KeepaliveParams(keepalive.ServerParameters{
 			Time: 5 * time.Minute,
 		}),
-		grpc.WaitForHandlers(true),
 	}
 
 	return grpc.NewServer(serverOptions...), nil
diff --git a/internal/praefect/server.go b/internal/praefect/server.go
index 48cacfc2fa6af54d7dda14bda7e0dc98be2373f1..f985791b1c45a7f29be87119531fbab9b77e816a 100644
--- a/internal/praefect/server.go
+++ b/internal/praefect/server.go
@@ -167,7 +167,6 @@ func NewGRPCServer(
 		grpc.KeepaliveParams(keepalive.ServerParameters{
 			Time: 5 * time.Minute,
 		}),
-		grpc.WaitForHandlers(true),
 	}...)
 
 	// Accept backchannel connections so that we can proxy sidechannels