diff --git a/classes/file/FileHandler.class.php b/classes/file/FileHandler.class.php
index 5edc58181..b56a1cd99 100644
--- a/classes/file/FileHandler.class.php
+++ b/classes/file/FileHandler.class.php
@@ -377,14 +377,17 @@ class FileHandler
 				$request_headers['Content-Type'] = $content_type;
 			}
 			
-			$proxy = parse_url(__PROXY_SERVER__);
-			if($proxy["host"])
+			if(defined('__PROXY_SERVER__'))
 			{
-				$request_options['proxy'] = array($proxy['host'] . ($proxy['port'] ? (':' . $proxy['port']) : ''));
-				if($proxy['user'] && $proxy['pass'])
+				$proxy = parse_url(__PROXY_SERVER__);
+				if($proxy["host"])
 				{
-					$request_options['proxy'][] = $proxy['user'];
-					$request_options['proxy'][] = $proxy['pass'];
+					$request_options['proxy'] = array($proxy['host'] . ($proxy['port'] ? (':' . $proxy['port']) : ''));
+					if($proxy['user'] && $proxy['pass'])
+					{
+						$request_options['proxy'][] = $proxy['user'];
+						$request_options['proxy'][] = $proxy['pass'];
+					}
 				}
 			}
 			
diff --git a/common/constants.php b/common/constants.php
index 73878e5d3..b05dc2eb5 100644
--- a/common/constants.php
+++ b/common/constants.php
@@ -133,7 +133,6 @@ define('_XE_PACKAGE_', 'XE');
 define('_XE_LOCATION_', 'en');
 define('_XE_LOCATION_SITE_', 'https://www.xpressengine.com/');
 define('_XE_DOWNLOAD_SERVER_', 'https://download.xpressengine.com/');
-define('__PROXY_SERVER__', null);
 define('__DEBUG__', 0);
 
 /**