diff --git a/internal/route/reverse_proxy.go b/internal/route/reverse_proxy.go
index a4180d6..817b778 100755
--- a/internal/route/reverse_proxy.go
+++ b/internal/route/reverse_proxy.go
@@ -167,7 +167,7 @@ func (r *ReveseProxyRoute) Start(parent task.Parent) gperr.Error {
 		r.addToLoadBalancer(parent)
 	} else {
 		routes.SetHTTPRoute(r.TargetName(), r)
-		r.task.OnCancel("entrypoint_remove_route", func() {
+		r.task.OnFinished("entrypoint_remove_route", func() {
 			routes.DeleteHTTPRoute(r.TargetName())
 		})
 	}
diff --git a/internal/route/stream.go b/internal/route/stream.go
index 11f8efe..a52c9a8 100755
--- a/internal/route/stream.go
+++ b/internal/route/stream.go
@@ -84,7 +84,7 @@ func (r *StreamRoute) Start(parent task.Parent) gperr.Error {
 	go r.acceptConnections()
 
 	routes.SetStreamRoute(r.TargetName(), r)
-	r.task.OnCancel("entrypoint_remove_route", func() {
+	r.task.OnFinished("entrypoint_remove_route", func() {
 		routes.DeleteStreamRoute(r.TargetName())
 	})
 	return nil