diff --git a/src/libtomahawk/infosystem/infosystemworker.cpp b/src/libtomahawk/infosystem/infosystemworker.cpp
index c70cbe019..4b376a932 100644
--- a/src/libtomahawk/infosystem/infosystemworker.cpp
+++ b/src/libtomahawk/infosystem/infosystemworker.cpp
@@ -27,6 +27,8 @@
 #include "infoplugins/musixmatchplugin.h"
 #include "infoplugins/lastfmplugin.h"
 
+#include "lastfm/NetworkAccessManager"
+
 namespace Tomahawk
 {
 
@@ -165,7 +167,13 @@ void
 InfoSystemWorker::newNam()
 {
     qDebug() << Q_FUNC_INFO;
-    QNetworkAccessManager *newNam = new QNetworkAccessManager();
+
+    QNetworkAccessManager* newNam;
+#ifdef LIBLASTFM_FOUND
+    newNam = new lastfm::NetworkAccessManager( this );
+#else
+    newNam = new QNetworkAccessManager( this );
+#endif
     if ( m_nam )
     {
         delete m_nam;
diff --git a/src/tomahawkapp.cpp b/src/tomahawkapp.cpp
index b826711c2..5d9a91e23 100644
--- a/src/tomahawkapp.cpp
+++ b/src/tomahawkapp.cpp
@@ -224,10 +224,10 @@ TomahawkApp::init()
     qDebug() << "Setting NAM.";
     TomahawkUtils::setNam( lastfm::nam() );
 
-    #else
+#else
     qDebug() << "Setting NAM.";
     TomahawkUtils::setNam( new QNetworkAccessManager() );
-    #endif
+#endif
 
     // Set up proxy
     //FIXME: This overrides the lastfm proxy above?