diff --git a/src/libtomahawk/pipeline.cpp b/src/libtomahawk/pipeline.cpp
index dfa100965..22a1bd374 100644
--- a/src/libtomahawk/pipeline.cpp
+++ b/src/libtomahawk/pipeline.cpp
@@ -221,7 +221,7 @@ Pipeline::shuntNext()
 void
 Pipeline::shunt( const query_ptr& q )
 {
-    if( q->solved() )
+    if ( q->solved() )
     {
         qDebug() << "Query solved, pipeline aborted:" << q->toString()
                  << "numresults:" << q->results().length();
diff --git a/src/libtomahawk/query.cpp b/src/libtomahawk/query.cpp
index 39c26fa9f..09c60df19 100644
--- a/src/libtomahawk/query.cpp
+++ b/src/libtomahawk/query.cpp
@@ -81,7 +81,7 @@ Query::resultUnavailable()
     {
         if ( m_results.value( i ).data() == result )
         {
-            result_ptr r  = m_results.value( i );
+            result_ptr r = m_results.value( i );
             m_results.removeAt( i );
 
             emit resultsRemoved( r );
@@ -90,7 +90,10 @@ Query::resultUnavailable()
     }
 
     if ( m_results.isEmpty() )  // FIXME proper score checking
+    {
+        m_solved = false;
         emit solvedStateChanged( false );
+    }
 }