diff --git a/src/libtomahawk/database/databasecommand_resolve.cpp b/src/libtomahawk/database/databasecommand_resolve.cpp
index 8dcb3937c..85c6cabaf 100644
--- a/src/libtomahawk/database/databasecommand_resolve.cpp
+++ b/src/libtomahawk/database/databasecommand_resolve.cpp
@@ -24,8 +24,9 @@ DatabaseCommand_Resolve::exec( DatabaseImpl* lib )
         qDebug() << "Using result-hint to speed up resolving:" << m_query->resultHint();
 
         Tomahawk::result_ptr result = lib->result( m_query->resultHint() );
-        if ( !result.isNull() )
+        if ( !result.isNull() && result->collection()->source()->isOnline() )
         {
+            res << result;
             emit results( m_query->id(), res );
             return;
         }
diff --git a/src/libtomahawk/database/databaseimpl.cpp b/src/libtomahawk/database/databaseimpl.cpp
index 6199b2b1a..ade68f205 100644
--- a/src/libtomahawk/database/databaseimpl.cpp
+++ b/src/libtomahawk/database/databaseimpl.cpp
@@ -459,7 +459,7 @@ DatabaseImpl::result( const QString& url )
 {
     TomahawkSqlQuery query = newquery();
     Tomahawk::source_ptr s;
-    Tomahawk::result_ptr res;
+    Tomahawk::result_ptr res = Tomahawk::result_ptr( new Tomahawk::Result() );
     QString fileUrl;
 
     if ( url.contains( "servent://" ) )
@@ -539,6 +539,7 @@ DatabaseImpl::result( const QString& url )
         res->setAlbumPos( query.value( 14 ).toUInt() );
         res->setRID( uuid() );
         res->setId( query.value( 9 ).toUInt() );
+        res->setCollection( s->collection() );
     }
 
     return res;