diff --git a/src/main/java/mpo/dayon/assistant/gui/Assistant.java b/src/main/java/mpo/dayon/assistant/gui/Assistant.java
index 383eb063..d6267c56 100644
--- a/src/main/java/mpo/dayon/assistant/gui/Assistant.java
+++ b/src/main/java/mpo/dayon/assistant/gui/Assistant.java
@@ -262,12 +262,14 @@ public void actionPerformed(ActionEvent ev) {
             }
 
             private void resolvePublicIp() throws IOException, InterruptedException {
-                HttpClient client = HttpClient.newHttpClient();
-                HttpRequest request = HttpRequest.newBuilder()
-                        .uri(URI.create(WHATSMYIP_SERVER_URL))
-                        .timeout(Duration.ofSeconds(5))
-                        .build();
-                HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
+                HttpResponse<String> response;
+                try (HttpClient client = HttpClient.newHttpClient()) {
+                    HttpRequest request = HttpRequest.newBuilder()
+                            .uri(URI.create(WHATSMYIP_SERVER_URL))
+                            .timeout(Duration.ofSeconds(5))
+                            .build();
+                    response = client.send(request, HttpResponse.BodyHandlers.ofString());
+                }
                 publicIp = response.body();
             }
         };
@@ -574,12 +576,14 @@ public void actionPerformed(ActionEvent ev) {
             }
 
             private void requestToken() throws IOException, InterruptedException {
-                HttpClient client = HttpClient.newBuilder().build();
-                HttpRequest request = HttpRequest.newBuilder()
-                        .uri(URI.create(format(tokenServerUrl, networkConfiguration.getPort())))
-                        .timeout(Duration.ofSeconds(5))
-                        .build();
-                HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
+                HttpResponse<String> response;
+                try (HttpClient client = HttpClient.newBuilder().build()) {
+                    HttpRequest request = HttpRequest.newBuilder()
+                            .uri(URI.create(format(tokenServerUrl, networkConfiguration.getPort())))
+                            .timeout(Duration.ofSeconds(5))
+                            .build();
+                    response = client.send(request, HttpResponse.BodyHandlers.ofString());
+                }
                 token = response.body().trim();
             }
         };
diff --git a/src/main/java/mpo/dayon/common/version/Version.java b/src/main/java/mpo/dayon/common/version/Version.java
index c8c8dbd7..8ff22944 100644
--- a/src/main/java/mpo/dayon/common/version/Version.java
+++ b/src/main/java/mpo/dayon/common/version/Version.java
@@ -60,12 +60,11 @@ boolean isLatestVersion() {
 
     public String getLatestRelease() {
         if (latestVersion == null) {
-            HttpClient client = HttpClient.newHttpClient();
-            HttpRequest request = HttpRequest.newBuilder()
-                    .uri(URI.create(RELEASE_LOCATION + "latest"))
-                    .timeout(Duration.ofSeconds(5))
-                    .build();
-            try {
+            try (HttpClient client = HttpClient.newHttpClient()) {
+                HttpRequest request = HttpRequest.newBuilder()
+                        .uri(URI.create(RELEASE_LOCATION + "latest"))
+                        .timeout(Duration.ofSeconds(5))
+                        .build();
                 HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
                 String latestLocation = response.headers().firstValue("Location").orElse(null);
                 if (latestLocation != null) {