diff --git a/cmd/ledcontroller-server/main.go b/cmd/ledcontroller-server/main.go
index 5d9ca2e..2ef1c62 100755
--- a/cmd/ledcontroller-server/main.go
+++ b/cmd/ledcontroller-server/main.go
@@ -149,7 +149,10 @@ func main() {
 			}
 			if overrideEffect.Effect == "queue" {
 				if currentEffect.Duration > 0 {
-					currentEffect.Duration -= 40
+					if currentEffect.Duration%uint16(msDelay) != 0 {
+						currentEffect.Duration = uint16(currentEffect.Duration/uint16(msDelay)) * uint16(msDelay)
+					}
+					currentEffect.Duration -= uint16(msDelay)
 				} else {
 					if len(globalEffectChannel) > 0 {
 						previousEffect.Effect = "queue"