diff --git a/src/libtomahawk/result.cpp b/src/libtomahawk/result.cpp
index 413cb7e39..fb03c7aaf 100644
--- a/src/libtomahawk/result.cpp
+++ b/src/libtomahawk/result.cpp
@@ -159,7 +159,9 @@ Result::toVariant() const
     m.insert( "score", score() );
     m.insert( "sid", id() );
     m.insert( "discnumber", discnumber() );
-    m.insert( "composer", composer()->name() );
+
+    if ( !composer().isNull() )
+        m.insert( "composer", composer()->name() );
 
     return m;
 }