diff --git a/src/libtomahawk/network/Servent.cpp b/src/libtomahawk/network/Servent.cpp
index 1a141a7de..0d5c3c0ed 100644
--- a/src/libtomahawk/network/Servent.cpp
+++ b/src/libtomahawk/network/Servent.cpp
@@ -451,10 +451,10 @@ Servent::onSipInfoChanged()
 
 void Servent::handleSipInfo( const Tomahawk::peerinfo_ptr& peerInfo )
 {
-    // FIXME: Do we need this?
-    // SipInfo info = peerInfo->sipInfo();
-    // if ( !info.isValid() )
-    //    return;
+    // We do not have received the initial SipInfo for this client yet, so wait for it.
+    // Each client will have at least one non-visible SipInfo
+    if ( peerInfo->sipInfo().length() == 0 )
+        return;
 
     foreach ( SipInfo info, peerInfo->sipInfo() )
     {