diff --git a/app/controllers/general.php b/app/controllers/general.php
index 20a3c1c1d8..e20742d24e 100644
--- a/app/controllers/general.php
+++ b/app/controllers/general.php
@@ -51,8 +51,11 @@ App::init(function ($utopia, $request, $response, $console, $project, $user, $lo
     $port = \parse_url($request->getOrigin($referrer), PHP_URL_PORT);
 
     $refDomain = (!empty($protocol) ? $protocol : $request->getProtocol()).'://'.((\in_array($origin, $clients))
-        ? $origin : 'localhost') . (!empty($port) ? ':'.$port : '');
-    $refDomain = (!$route->getLabel('origin', false)) ? $refDomain : $origin; // This route is publicly accessible
+        ? $origin : 'localhost').(!empty($port) ? ':'.$port : '');
+    
+    $refDomain = (!$route->getLabel('origin', false))  // This route is publicly accessible
+        ? $refDomain
+        : (!empty($protocol) ? $protocol : $request->getProtocol()).'://'.$origin.(!empty($port) ? ':'.$port : '');
 
     $selfDomain = new Domain($request->getHostname());
     $endDomain = new Domain((string)$origin);