diff --git a/rest/rest-sqs/src/main/scala/org/elasticmq/rest/sqs/SendMessageDirectives.scala b/rest/rest-sqs/src/main/scala/org/elasticmq/rest/sqs/SendMessageDirectives.scala
index 4b2cc654..9ff3e1b7 100644
--- a/rest/rest-sqs/src/main/scala/org/elasticmq/rest/sqs/SendMessageDirectives.scala
+++ b/rest/rest-sqs/src/main/scala/org/elasticmq/rest/sqs/SendMessageDirectives.scala
@@ -135,6 +135,7 @@ trait SendMessageDirectives {
       case Some(v) if v > 0 && queueData.isFifo =>
         // FIFO queues don't support delays
         throw SQSException.invalidQueueTypeParameter(DelaySecondsParameter)
+      case Some(v) if v == 0 && queueData.isFifo => None
       case d => d
     }