diff --git a/Jellyfin.Server/HealthChecks/DbContextFactoryHealthCheck.cs b/Jellyfin.Server/HealthChecks/DbContextFactoryHealthCheck.cs
new file mode 100644
index 0000000000..bf00dcd53f
--- /dev/null
+++ b/Jellyfin.Server/HealthChecks/DbContextFactoryHealthCheck.cs
@@ -0,0 +1,43 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Diagnostics.HealthChecks;
+
+namespace Jellyfin.Server.HealthChecks;
+
+///
+/// Implementation of the for a .
+///
+/// The type of database context.
+public class DbContextFactoryHealthCheck : IHealthCheck
+ where TContext : DbContext
+{
+ private readonly IDbContextFactory _dbContextFactory;
+
+ ///
+ /// Initializes a new instance of the class.
+ ///
+ /// Instance of the interface.
+ public DbContextFactoryHealthCheck(IDbContextFactory contextFactory)
+ {
+ _dbContextFactory = contextFactory;
+ }
+
+ ///
+ public async Task CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default)
+ {
+ ArgumentNullException.ThrowIfNull(context);
+
+ var dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
+ await using (dbContext.ConfigureAwait(false))
+ {
+ if (await dbContext.Database.CanConnectAsync(cancellationToken).ConfigureAwait(false))
+ {
+ return HealthCheckResult.Healthy();
+ }
+ }
+
+ return HealthCheckResult.Unhealthy();
+ }
+}
diff --git a/Jellyfin.Server/Startup.cs b/Jellyfin.Server/Startup.cs
index 49a57aa688..5d6a278c40 100644
--- a/Jellyfin.Server/Startup.cs
+++ b/Jellyfin.Server/Startup.cs
@@ -8,6 +8,7 @@ using System.Text;
using Jellyfin.MediaEncoding.Hls.Extensions;
using Jellyfin.Networking.Configuration;
using Jellyfin.Server.Extensions;
+using Jellyfin.Server.HealthChecks;
using Jellyfin.Server.Implementations;
using Jellyfin.Server.Implementations.Extensions;
using Jellyfin.Server.Infrastructure;
@@ -122,7 +123,7 @@ namespace Jellyfin.Server
.ConfigurePrimaryHttpMessageHandler(defaultHttpClientHandlerDelegate);
services.AddHealthChecks()
- .AddDbContextCheck();
+ .AddCheck>(nameof(JellyfinDb));
services.AddHlsPlaylistGenerator();
}