diff --git a/src/mavsdk_server/src/grpc_server.cpp b/src/mavsdk_server/src/grpc_server.cpp
index e80741eb7f..e62a59e271 100644
--- a/src/mavsdk_server/src/grpc_server.cpp
+++ b/src/mavsdk_server/src/grpc_server.cpp
@@ -47,6 +47,7 @@ int GrpcServer::run()
     builder.RegisterService(&_transponder_service);
     builder.RegisterService(&_tune_service);
 
+    grpc::EnableDefaultHealthCheckService(true);
     _server = builder.BuildAndStart();
 
     if (_bound_port != 0) {