diff --git a/src/libtomahawk/audio/audioengine.cpp b/src/libtomahawk/audio/audioengine.cpp
index c83263e26..cd2bc6041 100644
--- a/src/libtomahawk/audio/audioengine.cpp
+++ b/src/libtomahawk/audio/audioengine.cpp
@@ -327,8 +327,7 @@ AudioEngine::sendNowPlayingNotification( const Tomahawk::InfoSystem::InfoType ty
         onNowPlayingInfoReady( type );
     else
     {
-        _detail::Closure* closure = NewClosure( m_currentTrack->album().data(), SIGNAL( updated() ), const_cast< AudioEngine* >( this ), SLOT( onNowPlayingInfoReady( const Tomahawk::InfoSystem::InfoType ) ), type );
-        Q_UNUSED( closure );
+        NewClosure( m_currentTrack->album().data(), SIGNAL( updated() ), const_cast< AudioEngine* >( this ), SLOT( onNowPlayingInfoReady( const Tomahawk::InfoSystem::InfoType ) ), type );
         m_currentTrack->album()->cover( QSize( 0, 0 ), true );
     }
 #endif
@@ -338,14 +337,11 @@ AudioEngine::sendNowPlayingNotification( const Tomahawk::InfoSystem::InfoType ty
 void
 AudioEngine::onNowPlayingInfoReady( const Tomahawk::InfoSystem::InfoType type )
 {
-    tDebug( LOGVERBOSE ) << Q_FUNC_INFO;
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << type;
     if ( m_currentTrack.isNull() ||
          m_currentTrack->track().isNull() ||
          m_currentTrack->artist().isNull() )
         return;
-
-    if ( !m_currentTrack->album().isNull() && sender() && m_currentTrack->album().data() != sender() )
-        return;
     
     QVariantMap playInfo;
 
@@ -392,6 +388,7 @@ AudioEngine::onNowPlayingInfoReady( const Tomahawk::InfoSystem::InfoType type )
     
     Tomahawk::InfoSystem::InfoPushData pushData ( s_aeInfoIdentifier, type, playInfo, Tomahawk::InfoSystem::PushShortUrlFlag );
 
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "pushing data with type " << type;
     Tomahawk::InfoSystem::InfoSystem::instance()->pushInfo( pushData );
 }
 
diff --git a/src/libtomahawk/infosystem/infoplugins/unix/fdonotifyplugin.cpp b/src/libtomahawk/infosystem/infoplugins/unix/fdonotifyplugin.cpp
index dde0f37b4..e3bb136d9 100644
--- a/src/libtomahawk/infosystem/infoplugins/unix/fdonotifyplugin.cpp
+++ b/src/libtomahawk/infosystem/infoplugins/unix/fdonotifyplugin.cpp
@@ -49,6 +49,7 @@
 
 using namespace Tomahawk::InfoSystem;
 
+static const int s_nowPlayingNotificationId = 1;
 
 FdoNotifyPlugin::FdoNotifyPlugin()
     : InfoPlugin()
@@ -119,6 +120,7 @@ FdoNotifyPlugin::notifyUser( const QString &messageText )
 void
 FdoNotifyPlugin::nowPlaying( const QVariant &input )
 {
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO;
     if ( !input.canConvert< QVariantMap >() )
         return;
 
@@ -135,11 +137,13 @@ FdoNotifyPlugin::nowPlaying( const QVariant &input )
                         .arg( hash[ "title" ] )
                         .arg( hash[ "artist" ] )
                         .arg( hash[ "album" ].isEmpty() ? QString() : QString( " %1" ).arg( tr( "on \"%1\"" ).arg( hash[ "album" ] ) ) );
-    
+
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "sending message" << messageText;
+
     QDBusMessage message = QDBusMessage::createMethodCall( "org.freedesktop.Notifications", "/org/freedesktop/Notifications", "org.freedesktop.Notifications", "Notify" );
     QList<QVariant> arguments;
     arguments << QString( "Tomahawk" ); //app_name
-    arguments << quint32( 0 ); //notification_id
+    arguments << quint32( s_nowPlayingNotificationId ); //notification_id
     arguments << QString(); //app_icon
     arguments << QString( "Tomahawk" ); //summary
     arguments << messageText; //body