diff --git a/modules/aws/master-asg/elb.tf b/modules/aws/master-asg/elb.tf
index 8bdaa4ff45..5b3c4f27af 100644
--- a/modules/aws/master-asg/elb.tf
+++ b/modules/aws/master-asg/elb.tf
@@ -4,6 +4,8 @@ resource "aws_elb" "api-internal" {
   internal        = true
   security_groups = ["${var.api_sg_ids}"]
 
+  idle_timeout = 3600
+
   listener {
     instance_port     = 443
     instance_protocol = "tcp"
@@ -44,6 +46,8 @@ resource "aws_elb" "api-external" {
   internal        = false
   security_groups = ["${var.api_sg_ids}"]
 
+  idle_timeout = 3600
+
   listener {
     instance_port     = 22
     instance_protocol = "tcp"
@@ -91,6 +95,8 @@ resource "aws_elb" "console" {
   internal        = "${var.public_vpc ? false : true}"
   security_groups = ["${var.console_sg_ids}"]
 
+  idle_timeout = 3600
+
   listener {
     instance_port     = 32001
     instance_protocol = "tcp"