diff --git a/src/eth/rpc/rpc_server.rs b/src/eth/rpc/rpc_server.rs
index a691edcdc..b222a1d3e 100644
--- a/src/eth/rpc/rpc_server.rs
+++ b/src/eth/rpc/rpc_server.rs
@@ -238,11 +238,20 @@ async fn stratus_startup(_: Params<'_>, _: Arc<RpcContext>, _: Extensions) -> an
 async fn stratus_readiness(_: Params<'_>, context: Arc<RpcContext>, _: Extensions) -> anyhow::Result<JsonValue, RpcError> {
     let should_serve = context.consensus.should_serve().await;
     tracing::info!("stratus_readiness: {}", should_serve);
-    Ok(json!(should_serve))
+
+    if should_serve {
+        Ok(json!(true))
+    } else {
+        Err(RpcError::Response(rpc_internal_error("Service Not Ready".to_string())))
+    }
 }
 
 async fn stratus_liveness(_: Params<'_>, _: Arc<RpcContext>, _: Extensions) -> anyhow::Result<JsonValue, RpcError> {
-    Ok(json!(true))
+    if !GlobalState::is_shutdown() {
+        Ok(json!(true))
+    } else {
+        Err(RpcError::Response(rpc_internal_error("Service Unhealthy".to_string())))
+    }
 }
 
 // -----------------------------------------------------------------------------