diff --git a/src/libtomahawk/utils/tomahawkutils.cpp b/src/libtomahawk/utils/tomahawkutils.cpp
index 03552b3a9..4b8207238 100644
--- a/src/libtomahawk/utils/tomahawkutils.cpp
+++ b/src/libtomahawk/utils/tomahawkutils.cpp
@@ -481,7 +481,6 @@ NetworkProxyFactory::NetworkProxyFactory( const NetworkProxyFactory& other )
 QList< QNetworkProxy >
 NetworkProxyFactory::proxyForQuery( const QNetworkProxyQuery& query )
 {
-    tDebug() << Q_FUNC_INFO << " in thread " << QThread::currentThread() << " for query " << query.url();
     TomahawkUtils::NetworkProxyFactory* proxyFactory = TomahawkUtils::proxyFactory();
     QList< QNetworkProxy > proxies = proxyFactory->queryProxy( query );
     return proxies;
@@ -491,7 +490,6 @@ NetworkProxyFactory::proxyForQuery( const QNetworkProxyQuery& query )
 QList< QNetworkProxy >
 NetworkProxyFactory::queryProxy( const QNetworkProxyQuery& query )
 {
-    tDebug() << Q_FUNC_INFO << " in thread " << QThread::currentThread() << " for query " << query.url();
     QList< QNetworkProxy > proxies;
     QString hostname = query.peerHostName();
     if ( hostname.isEmpty() || m_noProxyHosts.contains( hostname ) )
@@ -615,15 +613,17 @@ nam()
 {
     QMutexLocker locker( &s_namAccessMutex );
     if ( s_threadNamHash.contains(  QThread::currentThread() ) )
-    {
-        tDebug( LOGEXTRA ) << "returning existing nam for thread " << QThread::currentThread();
         return s_threadNamHash[ QThread::currentThread() ];
-    }
 
     if ( !s_threadNamHash.contains( TOMAHAWK_APPLICATION::instance()->thread() ) )
     {
-        tDebug( LOGEXTRA ) << "no gui thread (" << TOMAHAWK_APPLICATION::instance()->thread() << ") nam available to copy, returning 0";
-        return 0;
+        if ( QThread::currentThread() == TOMAHAWK_APPLICATION::instance()->thread() )
+        {
+            setNam( new QNetworkAccessManager(), true );
+            return s_threadNamHash[ QThread::currentThread() ];
+        }
+        else
+            return 0;
     }
 
     // Create a nam for this thread based on the main thread's settings but with its own proxyfactory
@@ -643,12 +643,12 @@ nam()
 
 
 void
-setNam( QNetworkAccessManager* nam )
+setNam( QNetworkAccessManager* nam, bool noMutexLocker )
 {
     Q_ASSERT( nam );
     // Don't lock if being called from nam()()
-    tDebug( LOGEXTRA ) << "setting nam for thread " << QThread::currentThread();
-    QMutexLocker locker( &s_namAccessMutex );
+    QMutex otherMutex;
+    QMutexLocker locker( noMutexLocker ? &otherMutex : &s_namAccessMutex );
     if ( !s_threadNamHash.contains( TOMAHAWK_APPLICATION::instance()->thread() ) &&
             QThread::currentThread() == TOMAHAWK_APPLICATION::instance()->thread() )
     {
diff --git a/src/libtomahawk/utils/tomahawkutils.h b/src/libtomahawk/utils/tomahawkutils.h
index 028e55f27..b45dcb56e 100644
--- a/src/libtomahawk/utils/tomahawkutils.h
+++ b/src/libtomahawk/utils/tomahawkutils.h
@@ -98,7 +98,7 @@ namespace TomahawkUtils
     DLLEXPORT QNetworkAccessManager* nam();
 
     DLLEXPORT void setProxyFactory( TomahawkUtils::NetworkProxyFactory* factory, bool noMutexLocker = false );
-    DLLEXPORT void setNam( QNetworkAccessManager* nam );
+    DLLEXPORT void setNam( QNetworkAccessManager* nam, bool noMutexLocker = false );
 
     DLLEXPORT QWidget* tomahawkWindow();
     /// Platform-specific bringing tomahawk mainwindow to front, b/c qt's activate() and such don't seem to work well enough for us
diff --git a/src/tomahawkapp.cpp b/src/tomahawkapp.cpp
index 8c05517fe..588854d80 100644
--- a/src/tomahawkapp.cpp
+++ b/src/tomahawkapp.cpp
@@ -161,7 +161,7 @@ TomahawkApp::init()
     
     tDebug( LOGINFO ) << "Setting NAM.";
     // Cause the creation of the nam, but don't need to address it directly, so prevent warning
-    TomahawkUtils::setNam( new QNetworkAccessManager() );
+    Q_UNUSED( TomahawkUtils::nam() );
 
     m_audioEngine = QWeakPointer<AudioEngine>( new AudioEngine );
     m_scanManager = QWeakPointer<ScanManager>( new ScanManager( this ) );