diff --git a/internal/bbr/devices/olt.go b/internal/bbr/devices/olt.go
index 7104880..a12d8c6 100644
--- a/internal/bbr/devices/olt.go
+++ b/internal/bbr/devices/olt.go
@@ -216,7 +216,6 @@
 
 	ctx, cancel := context.WithCancel(context.TODO())
 	go onu.ProcessOnuMessages(ctx, nil, client)
-	defer cancel()
 
 	go func() {
 
@@ -227,6 +226,8 @@
 				"TargetOnus":    o.TargetOnus,
 			}).Debugf("Onu done")
 
+			// close the ONU channel
+			cancel()
 		}()
 
 		for message := range onu.DoneChannel {