diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/registration/RegistrationServiceClient.java b/service/src/main/java/org/whispersystems/textsecuregcm/registration/RegistrationServiceClient.java
index fe1eb73bf..bf848b4a6 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/registration/RegistrationServiceClient.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/registration/RegistrationServiceClient.java
@@ -69,7 +69,9 @@ public class RegistrationServiceClient implements Managed {
           .trustManager(certificateInputStream)
           .build();
 
-      this.channel = Grpc.newChannelBuilderForAddress(host, port, tlsChannelCredentials).build();
+      this.channel = Grpc.newChannelBuilderForAddress(host, port, tlsChannelCredentials)
+          .idleTimeout(1, TimeUnit.MINUTES)
+          .build();
     }
 
     this.stub = RegistrationServiceGrpc.newFutureStub(channel)