diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/SystemDefaultDnsResolver.java b/httpclient5/src/main/java/org/apache/hc/client5/http/SystemDefaultDnsResolver.java
index 5043a594e..394953610 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/SystemDefaultDnsResolver.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/SystemDefaultDnsResolver.java
@@ -40,7 +40,23 @@ public class SystemDefaultDnsResolver implements DnsResolver {
 
     @Override
     public InetAddress[] resolve(final String host) throws UnknownHostException {
-        return InetAddress.getAllByName(host);
+        try {
+            // Try resolving using the default resolver
+            return InetAddress.getAllByName(host);
+        } catch (final UnknownHostException e) {
+            // If default resolver fails, try stripping the IPv6 zone ID and resolving again
+            String strippedHost = null;
+            if (host.charAt(0) == '[') {
+                final int i = host.lastIndexOf('%');
+                if (i != -1) {
+                    strippedHost = host.substring(0, i) + "]";
+                }
+            }
+            if (strippedHost != null) {
+                return InetAddress.getAllByName(strippedHost);
+            }
+            throw e;
+        }
     }
 
     @Override
diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/SystemDefaultDnsResolverTest.java b/httpclient5/src/test/java/org/apache/hc/client5/http/SystemDefaultDnsResolverTest.java
new file mode 100644
index 000000000..02e66f0d9
--- /dev/null
+++ b/httpclient5/src/test/java/org/apache/hc/client5/http/SystemDefaultDnsResolverTest.java
@@ -0,0 +1,67 @@
+/*
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+package org.apache.hc.client5.http;
+
+import org.junit.jupiter.api.Test;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class SystemDefaultDnsResolverTest {
+
+
+    @Test
+    void resolve() throws UnknownHostException {
+        final SystemDefaultDnsResolver resolver = SystemDefaultDnsResolver.INSTANCE;
+        final InetAddress[] result1 = resolver.resolve("127.0.0.1");
+        assertEquals(1, result1.length);
+        assertArrayEquals(new byte[]{127, 0, 0, 1}, result1[0].getAddress());
+    }
+
+    @Test
+    void resolveIPv6ZoneId() throws UnknownHostException {
+        final SystemDefaultDnsResolver resolver = SystemDefaultDnsResolver.INSTANCE;
+
+        // This is an IPv6 address literal with zone ID
+        final InetAddress[] result = resolver.resolve("[fe80::221:b7ff:fe8a:57d5%en4]");
+        assertEquals(1, result.length);
+        assertArrayEquals(new byte[]{(byte) 0xfe, (byte) 0x80, 0, 0, 0, 0, 0, 0, 0x02, 0x21, (byte) 0xb7, (byte) 0xff, (byte) 0xfe, (byte) 0x8a, 0x57, (byte) 0xd5}, result[0].getAddress());
+
+    }
+
+    @Test
+    void resolveCanonicalHostname() throws UnknownHostException {
+        final SystemDefaultDnsResolver resolver = SystemDefaultDnsResolver.INSTANCE;
+
+        final String result1 = resolver.resolveCanonicalHostname("example.com");
+        assertEquals("example.com", result1);
+    }
+
+}