diff --git a/deployment/modules/tileserver/alb_listeners.tf b/deployment/modules/tileserver/alb_listeners.tf
index 38710ab..a74255f 100644
--- a/deployment/modules/tileserver/alb_listeners.tf
+++ b/deployment/modules/tileserver/alb_listeners.tf
@@ -1,4 +1,5 @@
 resource "aws_alb_listener" "this_alb_listener" {
+  depends_on = ["aws_autoscaling_group.autoscalinggroup-this"]
   load_balancer_arn = "${data.terraform_remote_state.mono_alb.this_alb_arn}"
   port = 80
   protocol = "HTTP"
@@ -6,4 +7,7 @@ resource "aws_alb_listener" "this_alb_listener" {
     target_group_arn = "${aws_alb_target_group.target_group_this.arn}"
     type = "forward"
   }
+  lifecycle {
+    create_before_destroy = true
+  }
 }
\ No newline at end of file