diff --git a/orca-sql/src/main/kotlin/com/netflix/spinnaker/config/SqlConfiguration.kt b/orca-sql/src/main/kotlin/com/netflix/spinnaker/config/SqlConfiguration.kt
index 2a073d9a13..b0c3ba28cb 100644
--- a/orca-sql/src/main/kotlin/com/netflix/spinnaker/config/SqlConfiguration.kt
+++ b/orca-sql/src/main/kotlin/com/netflix/spinnaker/config/SqlConfiguration.kt
@@ -128,9 +128,10 @@ class SqlConfiguration {
 
   @Bean("dbHealthIndicator") fun dbHealthIndicator(
     sqlHealthcheckActivator: SqlHealthcheckActivator,
-    sqlProperties: SqlProperties
+    sqlProperties: SqlProperties,
+    dynamicConfigService: DynamicConfigService
   ) =
-    SqlHealthIndicator(sqlHealthcheckActivator, sqlProperties.connectionPool.dialect)
+    SqlHealthIndicator(sqlHealthcheckActivator, sqlProperties.connectionPool.dialect, dynamicConfigService)
 
   @ConditionalOnProperty("execution-repository.sql.enabled")
   @ConditionalOnMissingBean(NotificationClusterLock::class)
diff --git a/orca-sql/src/main/kotlin/com/netflix/spinnaker/orca/sql/SqlHealthIndicator.kt b/orca-sql/src/main/kotlin/com/netflix/spinnaker/orca/sql/SqlHealthIndicator.kt
index f3310807c5..3041a03279 100644
--- a/orca-sql/src/main/kotlin/com/netflix/spinnaker/orca/sql/SqlHealthIndicator.kt
+++ b/orca-sql/src/main/kotlin/com/netflix/spinnaker/orca/sql/SqlHealthIndicator.kt
@@ -15,6 +15,7 @@
  */
 package com.netflix.spinnaker.orca.sql
 
+import com.netflix.spinnaker.kork.dynamicconfig.DynamicConfigService
 import org.jooq.SQLDialect
 import org.springframework.boot.actuate.health.AbstractHealthIndicator
 import org.springframework.boot.actuate.health.Health
@@ -26,11 +27,14 @@ import org.springframework.boot.actuate.health.Health
  */
 class SqlHealthIndicator(
   private val sqlHealthcheckActivator: SqlHealthcheckActivator,
-  private val sqlDialect: SQLDialect
+  private val sqlDialect: SQLDialect,
+  private val dynamicConfigService: DynamicConfigService
 ) : AbstractHealthIndicator() {
 
   override fun doHealthCheck(builder: Health.Builder) {
-    if (sqlHealthcheckActivator.enabled) {
+    val overrideHealth = dynamicConfigService.isEnabled("sql.override-spring-health-check", false)
+
+    if (overrideHealth || sqlHealthcheckActivator.enabled) {
       builder.up().withDetail("database", sqlDialect.name)
     } else {
       builder.down().withDetail("database", sqlDialect.name).let {