diff --git a/VERSION b/VERSION
index 293bfa8..75b5dfa 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.16.7
+1.16.8
diff --git a/internal/bbsim/devices/onu.go b/internal/bbsim/devices/onu.go
index 95ade6d..72b37c0 100644
--- a/internal/bbsim/devices/onu.go
+++ b/internal/bbsim/devices/onu.go
@@ -689,7 +689,10 @@
 
 		return err
 	}
-	o.SendOMCIAlarmNotificationMsg(true, losReq.AlarmType)
+	// During the handleFlowRemove() we are closing the channel
+	if o.InternalState.Current() != OnuStateDisabled {
+		o.SendOMCIAlarmNotificationMsg(true, losReq.AlarmType)
+	}
 	// TODO if it's the last ONU on the PON, then send a PON LOS
 
 	if err := o.InternalState.Event(OnuTxDisable); err != nil {