diff --git a/application/src/main/java/org/thingsboard/server/service/system/DefaultSystemInfoService.java b/application/src/main/java/org/thingsboard/server/service/system/DefaultSystemInfoService.java
index 35db65bab2..8c4ca82783 100644
--- a/application/src/main/java/org/thingsboard/server/service/system/DefaultSystemInfoService.java
+++ b/application/src/main/java/org/thingsboard/server/service/system/DefaultSystemInfoService.java
@@ -112,13 +112,11 @@ public class DefaultSystemInfoService extends TbApplicationEventListener<Partiti
     public SystemInfo getSystemInfo() {
         SystemInfo systemInfo = new SystemInfo();
 
-        ServiceInfo serviceInfo = serviceInfoProvider.getServiceInfoWithCurrentSystemInfo();
-
         if (discoveryService.isMonolith()) {
             systemInfo.setMonolith(true);
-            systemInfo.setSystemData(Collections.singletonList(createSystemInfoData(serviceInfo)));
+            systemInfo.setSystemData(Collections.singletonList(createSystemInfoData(serviceInfoProvider.generateNewServiceInfoWithCurrentSystemInfo())));
         } else {
-            systemInfo.setSystemData(getSystemData(serviceInfo));
+            systemInfo.setSystemData(getSystemData(serviceInfoProvider.getServiceInfo()));
         }
 
         return systemInfo;
@@ -156,7 +154,7 @@ public class DefaultSystemInfoService extends TbApplicationEventListener<Partiti
 
     private void saveCurrentClusterSystemInfo() {
         long ts = System.currentTimeMillis();
-        List<SystemInfoData> clusterSystemData = getSystemData(serviceInfoProvider.getServiceInfoWithCurrentSystemInfo());
+        List<SystemInfoData> clusterSystemData = getSystemData(serviceInfoProvider.getServiceInfo());
         BasicTsKvEntry clusterDataKv = new BasicTsKvEntry(ts, new JsonDataEntry("clusterSystemData", JacksonUtil.toString(clusterSystemData)));
         doSave(Collections.singletonList(clusterDataKv));
     }
@@ -164,7 +162,6 @@ public class DefaultSystemInfoService extends TbApplicationEventListener<Partiti
     private void saveCurrentMonolithSystemInfo() {
         long ts = System.currentTimeMillis();
         List<TsKvEntry> tsList = new ArrayList<>();
-
         getMemoryUsage().ifPresent(v -> tsList.add(new BasicTsKvEntry(ts, new LongDataEntry("memoryUsage", v))));
         getTotalMemory().ifPresent(v -> tsList.add(new BasicTsKvEntry(ts, new LongDataEntry("totalMemory", v))));
         getFreeMemory().ifPresent(v -> tsList.add(new BasicTsKvEntry(ts, new LongDataEntry("freeMemory", v))));
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/discovery/DefaultTbServiceInfoProvider.java b/common/queue/src/main/java/org/thingsboard/server/queue/discovery/DefaultTbServiceInfoProvider.java
index a9eeb8ace0..47e3af6a24 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/discovery/DefaultTbServiceInfoProvider.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/discovery/DefaultTbServiceInfoProvider.java
@@ -79,7 +79,7 @@ public class DefaultTbServiceInfoProvider implements TbServiceInfoProvider {
             serviceTypes = Collections.singletonList(ServiceType.of(serviceType));
         }
 
-        serviceInfo = getServiceInfoWithCurrentSystemInfo();
+       generateNewServiceInfoWithCurrentSystemInfo();
     }
 
     @AfterContextReady
@@ -106,13 +106,13 @@ public class DefaultTbServiceInfoProvider implements TbServiceInfoProvider {
     }
 
     @Override
-    public ServiceInfo getServiceInfoWithCurrentSystemInfo() {
+    public ServiceInfo generateNewServiceInfoWithCurrentSystemInfo() {
         ServiceInfo.Builder builder = ServiceInfo.newBuilder()
                 .setServiceId(serviceId)
                 .addAllServiceTypes(serviceTypes.stream().map(ServiceType::name).collect(Collectors.toList()))
                 .setSystemInfo(getCurrentSystemInfoProto());
 
-        return builder.build();
+        return serviceInfo = builder.build();
     }
 
     private TransportProtos.SystemInfoProto getCurrentSystemInfoProto() {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/discovery/TbServiceInfoProvider.java b/common/queue/src/main/java/org/thingsboard/server/queue/discovery/TbServiceInfoProvider.java
index 300bc05f0a..e49cbbcfd9 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/discovery/TbServiceInfoProvider.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/discovery/TbServiceInfoProvider.java
@@ -16,7 +16,6 @@
 package org.thingsboard.server.queue.discovery;
 
 import org.thingsboard.server.common.msg.queue.ServiceType;
-import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ServiceInfo;
 
 public interface TbServiceInfoProvider {
@@ -29,6 +28,6 @@ public interface TbServiceInfoProvider {
 
     boolean isService(ServiceType serviceType);
 
-    ServiceInfo getServiceInfoWithCurrentSystemInfo();
+    ServiceInfo generateNewServiceInfoWithCurrentSystemInfo();
 
 }
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/discovery/ZkDiscoveryService.java b/common/queue/src/main/java/org/thingsboard/server/queue/discovery/ZkDiscoveryService.java
index a14c2e4a4f..fcf80bcf3d 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/discovery/ZkDiscoveryService.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/discovery/ZkDiscoveryService.java
@@ -143,7 +143,7 @@ public class ZkDiscoveryService implements DiscoveryService, PathChildrenCacheLi
         TransportProtos.ServiceInfo self = serviceInfoProvider.getServiceInfo();
         if (currentServerExists()) {
             log.trace("[{}] Updating ZK node for current instance: {}", self.getServiceId(), nodePath);
-            client.setData().forPath(nodePath, serviceInfoProvider.getServiceInfoWithCurrentSystemInfo().toByteArray());
+            client.setData().forPath(nodePath, serviceInfoProvider.generateNewServiceInfoWithCurrentSystemInfo().toByteArray());
         } else {
             try {
                 log.info("[{}] Creating ZK node for current instance", self.getServiceId());
diff --git a/ui-ngx/src/app/shared/components/help.component.html b/ui-ngx/src/app/shared/components/help.component.html
index c5603ad2cd..5ebac09c00 100644
--- a/ui-ngx/src/app/shared/components/help.component.html
+++ b/ui-ngx/src/app/shared/components/help.component.html
@@ -15,7 +15,7 @@
     limitations under the License.
 
 -->
-<button color="primary" mat-icon-button
+<button mat-icon-button
         type="button"
         (click)="gotoHelpPage()"
         matTooltip="{{'help.goto-help-page' | translate}}"