diff --git a/java/Glacier2/callback/Client.java b/java/Glacier2/callback/Client.java
index 9230d1bcc..e5efa5829 100644
--- a/java/Glacier2/callback/Client.java
+++ b/java/Glacier2/callback/Client.java
@@ -84,11 +84,8 @@ private static int run(com.zeroc.Ice.Communicator communicator)
             }
         }
 
-        int acmTimeout = router.getACMTimeout();
         com.zeroc.Ice.Connection connection = router.ice_getCachedConnection();
         assert(connection != null);
-        connection.setACM(java.util.OptionalInt.of(acmTimeout), null,
-                          java.util.Optional.of(com.zeroc.Ice.ACMHeartbeat.HeartbeatAlways));
         connection.setCloseCallback(con -> System.out.println("The Glacier2 session has been destroyed."));
 
         //
diff --git a/java/Ice/session/SessionFactoryI.java b/java/Ice/session/SessionFactoryI.java
index bab92ecd4..8f398174f 100644
--- a/java/Ice/session/SessionFactoryI.java
+++ b/java/Ice/session/SessionFactoryI.java
@@ -19,13 +19,6 @@ public SessionPrx create(String name, com.zeroc.Ice.Current current)
         //
         SessionPrx collocProxy = proxy.ice_endpoints(new com.zeroc.Ice.Endpoint[0]);
 
-        //
-        // Never close this connection from the client and turn on heartbeats with a timeout of 30s
-        //
-        current.con.setACM(java.util.OptionalInt.of(30),
-                           java.util.Optional.of(com.zeroc.Ice.ACMClose.CloseOff),
-                           java.util.Optional.of(com.zeroc.Ice.ACMHeartbeat.HeartbeatAlways));
-
         current.con.setCloseCallback(con ->
                  {
                      try