diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java
index c5d3473e9..8bb15b2e1 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java
@@ -891,7 +891,7 @@ public class TunnelController implements Logging {
                 if (!_config.containsKey(OPT_BUNDLE_REPLY))
                     _config.setProperty(OPT_BUNDLE_REPLY, "false");
                 if (!_config.containsKey(OPT_ENCTYPE))
-                    _config.setProperty(OPT_ENCTYPE, "4,0");
+                    _config.setProperty(OPT_ENCTYPE, "4");
             } else if (!isClient(type)) {
                 // override UI that sets it to false
                 _config.setProperty(OPT_BUNDLE_REPLY, "true");
@@ -903,7 +903,7 @@ public class TunnelController implements Logging {
                 if (!_config.containsKey(OPT_LOW_TAGS))
                     _config.setProperty(OPT_LOW_TAGS, "14");
                 if (!_config.containsKey(OPT_ENCTYPE))
-                    _config.setProperty(OPT_ENCTYPE, "4,0");
+                    _config.setProperty(OPT_ENCTYPE, "4");
             }
             // same default logic as in EditBean.getSigType() and GeneralHelper.getSigType()
             if (!isClient(type) ||
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java
index 896a7df99..195dc7053 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java
@@ -790,8 +790,8 @@ public class GeneralHelper {
     public boolean hasEncType(int tunnel, int encType) {
         TunnelController tun = getController(tunnel);
         if (tun == null) {
-            // New clients and servers default to both
-            return encType == 4 || encType == 0;
+            // New clients and servers now default to ECIES-only
+            return encType == 4;
         }
         // migration: HTTP proxy and shared clients default to both
         String type = tun.getType();
@@ -806,9 +806,9 @@ public class GeneralHelper {
         } else if (TunnelController.TYPE_HTTP_SERVER.equals(type) ||
                    TunnelController.TYPE_IRC_SERVER.equals(type) ||
                    TunnelController.TYPE_STREAMR_SERVER.equals(type)) {
-            dflt = "4,0";
+            dflt = "4";
         } else {
-            dflt = "0";
+            dflt = "4,0";
         }
         String senc = getProperty(tunnel, "i2cp.leaseSetEncType", dflt);
         String[] senca = DataHelper.split(senc, ",");
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java
index a861ea042..f600cde50 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java
@@ -909,9 +909,9 @@ public class TunnelConfig {
             if (TunnelController.TYPE_HTTP_SERVER.equals(_type) ||
                 TunnelController.TYPE_IRC_SERVER.equals(_type) ||
                 TunnelController.TYPE_STREAMR_SERVER.equals(_type)) {
-                dflt = "4,0";
+                dflt = "4";
             } else {
-                dflt = "0";
+                dflt = "4,0";
             }
             String senc = config.getProperty(OPT + "i2cp.leaseSetEncType", dflt);
             String slstyp = config.getProperty(OPT + "i2cp.leaseSetType", "0");
diff --git a/installer/resources/i2ptunnel.config b/installer/resources/i2ptunnel.config
index d3be530d7..4d2e36206 100644
--- a/installer/resources/i2ptunnel.config
+++ b/installer/resources/i2ptunnel.config
@@ -55,7 +55,7 @@ tunnel.1.option.i2cp.closeIdleTime=1200000
 tunnel.1.option.i2cp.closeOnIdle=true
 tunnel.1.option.i2cp.delayOpen=true
 tunnel.1.option.i2cp.destination.sigType=7
-tunnel.1.option.i2cp.leaseSetEncType=4,0
+tunnel.1.option.i2cp.leaseSetEncType=4
 tunnel.1.option.i2cp.newDestOnResume=false
 tunnel.1.option.i2cp.reduceIdleTime=600000
 tunnel.1.option.i2cp.reduceOnIdle=true
@@ -82,7 +82,7 @@ tunnel.3.i2cpPort=7654
 tunnel.3.option.inbound.nickname=eepsite
 tunnel.3.option.outbound.nickname=eepsite
 tunnel.3.option.i2cp.destination.sigType=7
-tunnel.3.option.i2cp.leaseSetEncType=4,0
+tunnel.3.option.i2cp.leaseSetEncType=4
 tunnel.3.option.inbound.length=3
 tunnel.3.option.inbound.lengthVariance=0
 tunnel.3.option.outbound.length=3