diff --git a/api/models/route.go b/api/models/route.go
index f24780726..b8c560bd8 100644
--- a/api/models/route.go
+++ b/api/models/route.go
@@ -90,9 +90,9 @@ func (r *Route) SetDefaults() {
 		r.Timeout = defaultRouteTimeout
 	}
 
-	//if r.IdleTimeout == 0 {
-	//	r.IdleTimeout = htfnScaleDownTimeout
-	//}
+	if r.IdleTimeout == 0 {
+		r.IdleTimeout = htfnScaleDownTimeout
+	}
 }
 
 // Validate validates field values, skipping zeroed fields if skipZero is true.
diff --git a/api/server/routes_update.go b/api/server/routes_update.go
index 2700f324c..f8ccb547f 100644
--- a/api/server/routes_update.go
+++ b/api/server/routes_update.go
@@ -39,9 +39,7 @@ func (s *Server) handleRouteUpdate(c *gin.Context) {
 	wroute.Route.AppName = c.MustGet(api.AppName).(string)
 	wroute.Route.Path = path.Clean(c.MustGet(api.Path).(string))
 
-	if wroute.Route.IdleTimeout == 0 {
-		wroute.Route.IdleTimeout = 30
-	}
+	wroute.Route.SetDefaults()
 
 	if err := wroute.Validate(true); err != nil {
 		log.WithError(err).Debug(models.ErrRoutesUpdate)