diff --git a/src/ReadinessChecker/ReadinessCheckerManager.php b/src/ReadinessChecker/ReadinessCheckerManager.php
index eb1071f9cdb0b6cb1eafc090ca15d338b17f858f..16f9436079d3fc2cdfb4f9bfa3b510d698d5bc56 100644
--- a/src/ReadinessChecker/ReadinessCheckerManager.php
+++ b/src/ReadinessChecker/ReadinessCheckerManager.php
@@ -94,7 +94,11 @@ class ReadinessCheckerManager implements ReadinessCheckerManagerInterface {
    * {@inheritdoc}
    */
   public function timestamp() {
-    return $this->keyValue->get('readiness_check_timestamp', 0);
+    $last_check_timestamp = $this->keyValue->get('readiness_check_timestamp');
+    if (!is_numeric($last_check_timestamp)) {
+      $last_check_timestamp = \Drupal::state()->get('install_time', 0);
+    }
+    return $last_check_timestamp;
   }
 
   /**