diff --git a/internal/bbsim/devices/olt.go b/internal/bbsim/devices/olt.go
index 6484896..ce64b4e 100644
--- a/internal/bbsim/devices/olt.go
+++ b/internal/bbsim/devices/olt.go
@@ -703,9 +703,11 @@
 }
 
 func (o OltDevice) Reboot(context.Context, *openolt.Empty) (*openolt.Empty, error) {
-	oltLogger.Info("Shutting Down")
-	close(*o.oltDoneChannel)
-	close(*o.apiDoneChannel)
+	defer func() {
+		oltLogger.Info("Shutting Down")
+		close(*o.oltDoneChannel)
+		close(*o.apiDoneChannel)
+	}()
 	return new(openolt.Empty), nil
 }