diff --git a/src/infosystem/infoplugins/echonestplugin.cpp b/src/infosystem/infoplugins/echonestplugin.cpp
index 5f1e47d6a..cc9f08a9d 100644
--- a/src/infosystem/infoplugins/echonestplugin.cpp
+++ b/src/infosystem/infoplugins/echonestplugin.cpp
@@ -13,7 +13,6 @@ EchoNestPlugin::EchoNestPlugin(QObject *parent)
     : InfoPlugin(parent)
 {
     qDebug() << Q_FUNC_INFO;
-    Config::instance()->setAPIKey("JGJCRKWLXLBZIFAZB");
     QSet< InfoType > supportedTypes;
     supportedTypes << Tomahawk::InfoSystem::InfoArtistBiography << Tomahawk::InfoSystem::InfoArtistFamiliarity << Tomahawk::InfoSystem::InfoArtistHotttness << Tomahawk::InfoSystem::InfoArtistTerms << Tomahawk::InfoSystem::InfoMiscTopTerms;
     qobject_cast< InfoSystem* >(parent)->registerInfoTypes(this, supportedTypes);
diff --git a/src/tomahawkapp.cpp b/src/tomahawkapp.cpp
index 78a794ebc..e734e4045 100644
--- a/src/tomahawkapp.cpp
+++ b/src/tomahawkapp.cpp
@@ -127,7 +127,9 @@ TomahawkApp::TomahawkApp( int& argc, char *argv[] )
     setApplicationVersion( "1.0" ); // FIXME: last.fm "tst" auth requires 1.0 version according to docs, will change when we get our own identifier
     registerMetaTypes();
     setupLogfile();
-
+    
+    Echonest::Config::instance()->setAPIKey("JRIHWEP6GPOER2QQ6");
+    
     new TomahawkSettings( this );
     m_audioEngine = new AudioEngine;