diff --git a/app/controllers/general.php b/app/controllers/general.php
index ae5b17cee6..4483700d2b 100644
--- a/app/controllers/general.php
+++ b/app/controllers/general.php
@@ -1034,9 +1034,9 @@ App::init()
         $originValidator = new Origin($platforms);
 
         if (
-            $devKey->isEmpty()
+            !$originValidator->isValid($origin)
+            && $devKey->isEmpty()
             && !empty($origin)
-            && !$originValidator->isValid($origin)
             && \in_array($request->getMethod(), [Request::METHOD_POST, Request::METHOD_PUT, Request::METHOD_PATCH, Request::METHOD_DELETE])
             && $route->getLabel('origin', false) !== '*'
             && empty($request->getHeader('x-appwrite-key', ''))