diff --git a/src/Service/OaiService.php b/src/Service/OaiService.php
index ac74ea0..3a89878 100644
--- a/src/Service/OaiService.php
+++ b/src/Service/OaiService.php
@@ -209,10 +209,8 @@ public function start(): string
             $this->errorAllowedArguments($requestArguments['verb'], $requestArguments);
         }
 
-        if (!isset($requestArguments['from']) && isset($requestArguments['until'])) {
-            if (isset($this->oaiConfiguration['metadata_format_options'][$requestArguments['verb']]['requiredArguments'])) {
+        if (!isset($requestArguments['from']) && isset($requestArguments['until']) && isset($this->oaiConfiguration['metadata_format_options'][$requestArguments['verb']]['requiredArguments'])) {
                 $this->errorRequiredArguments($requestArguments['verb'], $requestArguments);
-            }
         }
 
         if ('GetRecord' === $requestArguments['verb']) {