diff --git a/src/libtomahawk/resolvers/JSInfoSystemHelper.cpp b/src/libtomahawk/resolvers/JSInfoSystemHelper.cpp
index fb556566a..6ceccdc64 100644
--- a/src/libtomahawk/resolvers/JSInfoSystemHelper.cpp
+++ b/src/libtomahawk/resolvers/JSInfoSystemHelper.cpp
@@ -39,7 +39,6 @@ JSInfoSystemHelper::~JSInfoSystemHelper()
 QStringList JSInfoSystemHelper::requiredScriptPaths() const
 {
     return QStringList()
-        << RESPATH "js/es6-promise-2.0.0.min.js"
         << RESPATH "js/tomahawk-infosystem.js";
 }
 
diff --git a/src/libtomahawk/resolvers/JSResolver.cpp b/src/libtomahawk/resolvers/JSResolver.cpp
index ee52c4391..7b3fc8d55 100644
--- a/src/libtomahawk/resolvers/JSResolver.cpp
+++ b/src/libtomahawk/resolvers/JSResolver.cpp
@@ -211,6 +211,10 @@ JSResolver::init()
         // add c++ part of tomahawk javascript library
         d->engine->mainFrame()->addToJavaScriptWindowObject( "Tomahawk", d->resolverHelper );
 
+        // load es6-promises shim
+        loadScript( RESPATH "js/es6-promise-2.0.0.min.js" );
+
+
         // Load CrytoJS core
         loadScript( RESPATH "js/cryptojs-core.js" );