diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/mappers/IOExceptionMapper.java b/service/src/main/java/org/whispersystems/textsecuregcm/mappers/IOExceptionMapper.java
index c57d16755..54b6a5f3b 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/mappers/IOExceptionMapper.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/mappers/IOExceptionMapper.java
@@ -21,7 +21,10 @@ public class IOExceptionMapper implements ExceptionMapper<IOException> {
   public Response toResponse(IOException e) {
     if (!(e.getCause() instanceof java.util.concurrent.TimeoutException)) {
       logger.warn("IOExceptionMapper", e);
+    } else if (e.getCause().getMessage().startsWith("Idle timeout expired")) {
+      return Response.status(Response.Status.REQUEST_TIMEOUT).build();
     }
+
     return Response.status(503).build();
   }
 }