diff --git a/common/framework/HTTP.php b/common/framework/HTTP.php
index 51e0b79ce..1948dee49 100644
--- a/common/framework/HTTP.php
+++ b/common/framework/HTTP.php
@@ -209,9 +209,10 @@ class HTTP
 			];
 
 			// Add proxy settings.
-			if (defined('__PROXY_SERVER__'))
+			$proxy = config('other.proxy') ?: (defined('__PROXY_SERVER__') ? constant('__PROXY_SERVER__') : '');
+			if ($proxy !== '')
 			{
-				$proxy = parse_url(constant('__PROXY_SERVER__'));
+				$proxy = parse_url($proxy);
 				$proxy_scheme = preg_match('/^(https|socks)/', $proxy['scheme'] ?? '') ? ($proxy['scheme'] . '://') : 'http://';
 				$proxy_auth = (!empty($proxy['user']) && !empty($proxy['pass'])) ? ($proxy['user'] . ':' . $proxy['pass'] . '@') : '';
 				$settings['proxy'] = sprintf('%s%s%s:%s', $proxy_scheme, $proxy_auth, $proxy['host'], $proxy['port']);