diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaClusterFactory.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaClusterFactory.java
index 13da2895355..3d13d0c878a 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaClusterFactory.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaClusterFactory.java
@@ -194,7 +194,7 @@ private ReactiveFailover<PrometheusClientApi> prometheusStorageClient(ClustersPr
   private boolean prometheusStorageConfigured(ClustersProperties.Cluster cluster) {
     return Optional.ofNullable(cluster.getMetrics())
         .flatMap(m -> Optional.ofNullable(m.getStore()))
-        .flatMap(s -> Optional.of(s.getPrometheus()))
+        .flatMap(s -> Optional.ofNullable(s.getPrometheus()))
         .map(p -> StringUtils.hasText(p.getUrl()))
         .orElse(false);
   }