Merge "Releasing BBSim version 1.8.0 for VOLTHA-2.8"
diff --git a/internal/bbsim/devices/uni_port.go b/internal/bbsim/devices/uni_port.go
index da16dcc..eeda028 100644
--- a/internal/bbsim/devices/uni_port.go
+++ b/internal/bbsim/devices/uni_port.go
@@ -208,6 +208,9 @@
 }
 
 func (u *UniPort) Disable() error {
+	if u.OperState.Is(UniStateDown) {
+		return nil
+	}
 	return u.OperState.Event(uniTxDisable)
 }