diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/health/HealthzEndpoint.java b/server/src/main/java/org/cloudfoundry/identity/uaa/health/HealthzEndpoint.java
index 715a859dd46..99bc032a018 100644
--- a/server/src/main/java/org/cloudfoundry/identity/uaa/health/HealthzEndpoint.java
+++ b/server/src/main/java/org/cloudfoundry/identity/uaa/health/HealthzEndpoint.java
@@ -55,7 +55,7 @@ public String getHealthz(HttpServletResponse response) {
             return "stopping\n";
         } else {
             if (wasLastConnectionSuccessful == null) {
-                return "No Check done.\n";
+                return "UAA running. Database status unknown.\n";
             }
 
             if (wasLastConnectionSuccessful) {
diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/health/HealthzEndpointTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/health/HealthzEndpointTests.java
index 653e9934b29..153cac19bc0 100644
--- a/server/src/test/java/org/cloudfoundry/identity/uaa/health/HealthzEndpointTests.java
+++ b/server/src/test/java/org/cloudfoundry/identity/uaa/health/HealthzEndpointTests.java
@@ -50,7 +50,7 @@ void setUp() throws SQLException {
 
     @Test
     void getHealthz() {
-        assertEquals("No Check done.\n", endpoint.getHealthz(response));
+        assertEquals("UAA running. Database status unknown.\n", endpoint.getHealthz(response));
     }
 
     @Test