diff --git a/src/libtomahawk/utils/tomahawkutils.cpp b/src/libtomahawk/utils/tomahawkutils.cpp
index 96c899f15..b0a17dd3a 100644
--- a/src/libtomahawk/utils/tomahawkutils.cpp
+++ b/src/libtomahawk/utils/tomahawkutils.cpp
@@ -309,24 +309,15 @@ NetworkProxyFactory::NetworkProxyFactory( const NetworkProxyFactory& other )
 }
 
 
-QList< QNetworkProxy >
-NetworkProxyFactory::proxyForQuery( const QNetworkProxyQuery& query )
-{
-    TomahawkUtils::NetworkProxyFactory* proxyFactory = TomahawkUtils::proxyFactory();
-    QList< QNetworkProxy > proxies = proxyFactory->queryProxy( query );
-    return proxies;
-}
-
-
 QList< QNetworkProxy >
 NetworkProxyFactory::queryProxy( const QNetworkProxyQuery& query )
 {
     QList< QNetworkProxy > proxies;
     QString hostname = query.peerHostName();
     if ( m_proxy.hostName().isEmpty() || hostname.isEmpty() || m_noProxyHosts.contains( hostname ) || TomahawkSettings::instance()->proxyType() == QNetworkProxy::NoProxy )
-        proxies << QNetworkProxy( QNetworkProxy::DefaultProxy ) << QNetworkProxy( QNetworkProxy::NoProxy );
+        proxies << systemProxyForQuery( query );
     else
-        proxies << m_proxy << QNetworkProxy( QNetworkProxy::DefaultProxy ) << QNetworkProxy( QNetworkProxy::NoProxy );
+        proxies << m_proxy << systemProxyForQuery( query );
 
     return proxies;
 }
diff --git a/src/libtomahawk/utils/tomahawkutils.h b/src/libtomahawk/utils/tomahawkutils.h
index c631bf7a0..c60bf89d4 100644
--- a/src/libtomahawk/utils/tomahawkutils.h
+++ b/src/libtomahawk/utils/tomahawkutils.h
@@ -52,7 +52,6 @@ namespace TomahawkUtils
         virtual ~NetworkProxyFactory() {}
 
         virtual QList< QNetworkProxy > queryProxy( const QNetworkProxyQuery & query = QNetworkProxyQuery() );
-        static QList< QNetworkProxy > proxyForQuery( const QNetworkProxyQuery & query );
 
         virtual void setNoProxyHosts( const QStringList &hosts );
         virtual QStringList noProxyHosts() const { return m_noProxyHosts; }