diff --git a/app/classes/Framadate/Utils.php b/app/classes/Framadate/Utils.php
index c7d146c1feff32b5751fcdd003e8ceafb58854c8..88f9fa60144301935a92d7a411693b599fc1ddfc 100644
--- a/app/classes/Framadate/Utils.php
+++ b/app/classes/Framadate/Utils.php
@@ -34,15 +34,13 @@ class Utils {
             (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https')
         ) ? 'https' : 'http';
 
+        $domain = defined('APP_URL') ? APP_URL : $serverName;
         $port = in_array($serverPort, ['80', '443'], true) ? '' : ':' . $serverPort;
         $dirname = dirname($_SERVER['SCRIPT_NAME']);
         $dirname = $dirname === '\\' ? '/' : $dirname . '/';
         $dirname = str_replace('/admin', '', $dirname);
         $dirname = str_replace('/action', '', $dirname);
 
-        $appUrlConfig = defined('APP_URL') ? APP_URL : '';
-        $domain = $appUrlConfig === '' ? $serverName : $appUrlConfig;
-        
         return $scheme . '://' . preg_replace('#//+#', '/', $domain . $port . $dirname);
     }