diff --git a/app/classes/Framadate/Utils.php b/app/classes/Framadate/Utils.php
index 24b795945e5572251555e73307b8e7e6cf1c88ed..c7d146c1feff32b5751fcdd003e8ceafb58854c8 100644
--- a/app/classes/Framadate/Utils.php
+++ b/app/classes/Framadate/Utils.php
@@ -39,9 +39,11 @@ class Utils {
         $dirname = $dirname === '\\' ? '/' : $dirname . '/';
         $dirname = str_replace('/admin', '', $dirname);
         $dirname = str_replace('/action', '', $dirname);
-        $server_name = (defined('APP_URL') ? APP_URL : $serverName) . $port . $dirname;
 
-        return $scheme . '://' . preg_replace('#//+#', '/', $server_name);
+        $appUrlConfig = defined('APP_URL') ? APP_URL : '';
+        $domain = $appUrlConfig === '' ? $serverName : $appUrlConfig;
+        
+        return $scheme . '://' . preg_replace('#//+#', '/', $domain . $port . $dirname);
     }
 
     /**