diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
index 49a78eecea..e1217197e0 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
@@ -1,6 +1,7 @@
 package com.provectus.kafka.ui.config;
 
-import com.provectus.kafka.ui.model.MetricsScrapeProperties;
+import static com.provectus.kafka.ui.model.MetricsScrapeProperties.JMX_METRICS_TYPE;
+
 import jakarta.annotation.PostConstruct;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -167,7 +168,7 @@ public class ClustersProperties {
   private void setMetricsDefaults() {
     for (Cluster cluster : clusters) {
       if (cluster.getMetrics() != null && !StringUtils.hasText(cluster.getMetrics().getType())) {
-        cluster.getMetrics().setType(MetricsScrapeProperties.JMX_METRICS_TYPE);
+        cluster.getMetrics().setType(JMX_METRICS_TYPE);
       }
     }
   }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/PrometheusExposeController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/PrometheusExposeController.java
index 4bfb0408e9..df02bbc127 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/PrometheusExposeController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/PrometheusExposeController.java
@@ -3,7 +3,7 @@ package com.provectus.kafka.ui.controller;
 import com.provectus.kafka.ui.api.PrometheusExposeApi;
 import com.provectus.kafka.ui.model.KafkaCluster;
 import com.provectus.kafka.ui.service.StatisticsCache;
-import com.provectus.kafka.ui.util.PrometheusEndpointUtil;
+import com.provectus.kafka.ui.service.metrics.PrometheusEndpointExpose;
 import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
@@ -20,7 +20,7 @@ public class PrometheusExposeController extends AbstractController implements Pr
   @Override
   public Mono<ResponseEntity<String>> getAllMetrics(ServerWebExchange exchange) {
     return Mono.just(
-        PrometheusEndpointUtil.exposeAllMetrics(
+        PrometheusEndpointExpose.exposeAllMetrics(
             clustersStorage.getKafkaClusters()
                 .stream()
                 .collect(Collectors.toMap(KafkaCluster::getName, c -> statisticsCache.get(c).getMetrics()))
@@ -31,7 +31,7 @@ public class PrometheusExposeController extends AbstractController implements Pr
   @Override
   public Mono<ResponseEntity<String>> getAllClusterMetrics(String clusterName, ServerWebExchange exchange) {
     return Mono.just(
-        PrometheusEndpointUtil.exposeClusterMetrics(
+        PrometheusEndpointExpose.exposeClusterMetrics(
             statisticsCache.get(getCluster(clusterName)).getMetrics()
         )
     );
@@ -42,7 +42,7 @@ public class PrometheusExposeController extends AbstractController implements Pr
                                                        Long brokerId,
                                                        ServerWebExchange exchange) {
     return Mono.just(
-        PrometheusEndpointUtil.exposeBrokerMetrics(
+        PrometheusEndpointExpose.exposeBrokerMetrics(
             statisticsCache.get(getCluster(clusterName)).getMetrics(), brokerId.intValue()
         )
     );
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/PrometheusEndpointUtil.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/PrometheusEndpointExpose.java
similarity index 94%
rename from kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/PrometheusEndpointUtil.java
rename to kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/PrometheusEndpointExpose.java
index 16691b84fc..c54136e000 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/PrometheusEndpointUtil.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/PrometheusEndpointExpose.java
@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.util;
+package com.provectus.kafka.ui.service.metrics;
 
 import static io.prometheus.client.Collector.MetricFamilySamples;
 
@@ -17,9 +17,9 @@ import lombok.SneakyThrows;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.ResponseEntity;
 
-public final class PrometheusEndpointUtil {
+public final class PrometheusEndpointExpose {
 
-  private PrometheusEndpointUtil() {
+  private PrometheusEndpointExpose() {
   }
 
   public static ResponseEntity<String> exposeAllMetrics(Map<String, Metrics> clustersMetrics) {
@@ -48,7 +48,7 @@ public final class PrometheusEndpointUtil {
             .map(mfs -> addLbl(mfs, "cluster", e.getKey())))
         // merging MFS with same name, keeping order
         .collect(Collectors.toMap(mfs -> mfs.name, mfs -> mfs,
-            PrometheusEndpointUtil::concatSamples, LinkedHashMap::new))
+            PrometheusEndpointExpose::concatSamples, LinkedHashMap::new))
         .values()
         .stream();
   }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/scrape/MetricsScrapping.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/scrape/MetricsScrapping.java
index e6c6fc5ff8..b2f1f945a3 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/scrape/MetricsScrapping.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/scrape/MetricsScrapping.java
@@ -38,7 +38,7 @@ public class MetricsScrapping {
     var metrics = cluster.getMetrics();
     if (cluster.getMetrics() != null) {
       var scrapeProperties = createScrapeProps(cluster);
-      if (metrics.getType() == null || metrics.getType().equalsIgnoreCase(JMX_METRICS_TYPE)) {
+      if (metrics.getType().equalsIgnoreCase(JMX_METRICS_TYPE) && metrics.getPort() != null) {
         jmxMetricsScraper = new JmxMetricsScraper(scrapeProperties, jmxMetricsRetriever);
       } else if (metrics.getType().equalsIgnoreCase(PROMETHEUS_METRICS_TYPE)) {
         prometheusScraper = new PrometheusScraper(scrapeProperties);
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/scrape/jmx/JmxMetricsRetriever.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/scrape/jmx/JmxMetricsRetriever.java
index b1a49756ab..40066a7340 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/scrape/jmx/JmxMetricsRetriever.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/scrape/jmx/JmxMetricsRetriever.java
@@ -44,12 +44,12 @@ public class JmxMetricsRetriever implements Closeable {
     JmxSslSocketFactory.clearFactoriesCache();
   }
 
-  public Mono<List<RawMetric>> retrieveFromNode(MetricsScrapeProperties metricsConfig, Node node) {
-    if (isSslJmxEndpoint(metricsConfig) && !SSL_JMX_SUPPORTED) {
+  public Mono<List<RawMetric>> retrieveFromNode(MetricsScrapeProperties scrapeProperties, Node node) {
+    if (isSslJmxEndpoint(scrapeProperties) && !SSL_JMX_SUPPORTED) {
       log.warn("Cluster has jmx ssl configured, but it is not supported by app");
       return Mono.just(List.of());
     }
-    return Mono.fromSupplier(() -> retrieveSync(metricsConfig, node))
+    return Mono.fromSupplier(() -> retrieveSync(scrapeProperties, node))
         .subscribeOn(Schedulers.boundedElastic());
   }
 
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/metrics/scrape/prometheus/PrometheusEndpointParserTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/metrics/scrape/prometheus/PrometheusEndpointParserTest.java
index 3be48bd2d7..4dbdc83355 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/metrics/scrape/prometheus/PrometheusEndpointParserTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/metrics/scrape/prometheus/PrometheusEndpointParserTest.java
@@ -4,13 +4,12 @@ import static com.provectus.kafka.ui.service.metrics.scrape.prometheus.Prometheu
 import static io.prometheus.client.Collector.MetricFamilySamples;
 import static io.prometheus.client.Collector.MetricFamilySamples.Sample;
 import static io.prometheus.client.Collector.Type;
-import static java.lang.Double.NaN;
 import static java.lang.Double.POSITIVE_INFINITY;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.google.common.collect.Iterators;
 import com.google.common.collect.Lists;
-import com.provectus.kafka.ui.util.PrometheusEndpointUtil;
+import com.provectus.kafka.ui.service.metrics.PrometheusEndpointExpose;
 import io.prometheus.client.Collector;
 import io.prometheus.client.CollectorRegistry;
 import io.prometheus.client.Counter;
@@ -27,7 +26,7 @@ class PrometheusEndpointParserTest {
   @Test
   void parsesAllGeneratedMetricTypes() {
     List<MetricFamilySamples> original = generateMfs();
-    String exposed = PrometheusEndpointUtil.constructResponse(original.stream()).getBody();
+    String exposed = PrometheusEndpointExpose.constructResponse(original.stream()).getBody();
     List<MetricFamilySamples> parsed = parse(exposed.lines());
     assertThat(parsed).containsExactlyElementsOf(original);
   }
@@ -37,8 +36,8 @@ class PrometheusEndpointParserTest {
     String expose = """
             # HELP http_requests_total The total number of HTTP requests.
             # TYPE http_requests_total counter
-            http_requests_total{method="post",code="200"} 1027 1395066363000
-            http_requests_total{method="post",code="400"}    3 1395066363000
+            http_requests_total{method="post",code="200",} 1027 1395066363000
+            http_requests_total{method="post",code="400",}    3 1395066363000
             # Minimalistic line:
             metric_without_timestamp_and_labels 12.47