diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS4aServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS4aServer.java
index 1e76389cd94d3d4ffb145369c8b6c6f008c6dba3..58ea0ee944e5468829684b9e005789ab9291db02 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS4aServer.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS4aServer.java
@@ -118,9 +118,9 @@ public class SOCKS4aServer extends SOCKSServer {
             }
         }
 
-        // Check if the requested IP should be mapped to a .i2p URL
+        // Check if the requested IP should be mapped to a URL
         String mappedUrl = getMappedUrlForIP(connHostName);
-        if (mappedUrl != null && mappedUrl.toLowerCase(Locale.US).endsWith(".i2p")) {
+        if (mappedUrl != null) {
             _log.debug("IPV4 address " + connHostName + " was mapped to URL " + mappedUrl);
             connHostName = mappedUrl;
         }
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS5Server.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS5Server.java
index 0f60c34b81a689c92f4488836e26f9c32ffa39fb..840cd8966220c17281acf53b1881db29965a94ed 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS5Server.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS5Server.java
@@ -206,9 +206,9 @@ public class SOCKS5Server extends SOCKSServer {
                     connHostName += ".";
                 }
             }
-            // Check if the requested IP should be mapped to a .i2p URL
+            // Check if the requested IP should be mapped to a URL
             String mappedUrl = getMappedUrlForIP(connHostName);
-            if (mappedUrl != null && mappedUrl.toLowerCase(Locale.US).endsWith(".i2p")) {
+            if (mappedUrl != null) {
                 _log.debug("IPV4 address " + connHostName + " was mapped to URL " + mappedUrl);
                 addressType = AddressType.DOMAINNAME;
                 connHostName = mappedUrl;