diff --git a/src/browser/BrowserSettings.cpp b/src/browser/BrowserSettings.cpp
index d15f57d46..2df7fc1c5 100755
--- a/src/browser/BrowserSettings.cpp
+++ b/src/browser/BrowserSettings.cpp
@@ -156,7 +156,10 @@ void BrowserSettings::setUseCustomProxy(bool enabled)
 
 QString BrowserSettings::customProxyLocation()
 {
-    return config()->get("Browser/CustomProxyLocation", " ").toString();
+    if (!useCustomProxy()) {
+        return QString();
+    }
+    return config()->get("Browser/CustomProxyLocation", "").toString();
 }
 
 void BrowserSettings::setCustomProxyLocation(QString location)