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 3ad6164c61..f7a4d2abf6 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
@@ -251,25 +251,21 @@ public class ZkDiscoveryService implements DiscoveryService, PathChildrenCacheLi
             }
         } catch (Exception e) {
             log.error("Failed to delete ZK node {}", nodePath, e);
-            throw new RuntimeException(e);
         }
     }
 
     private void destroyZkClient() {
         stopped = true;
-        try {
-            unpublishCurrentServer();
-        } catch (Exception e) {
-        }
+        unpublishCurrentServer();
         CloseableUtils.closeQuietly(cache);
         CloseableUtils.closeQuietly(client);
         log.info("ZK client disconnected");
     }
 
     @PreDestroy
-    public void destroy() {
-        destroyZkClient();
+    private void destroy() {
         zkExecutorService.shutdownNow();
+        destroyZkClient();
         log.info("Stopped discovery service");
     }