diff --git a/src/libtomahawk/playlist/XspfUpdater.cpp b/src/libtomahawk/playlist/XspfUpdater.cpp
index e793e0ba1..fdca18a71 100644
--- a/src/libtomahawk/playlist/XspfUpdater.cpp
+++ b/src/libtomahawk/playlist/XspfUpdater.cpp
@@ -19,10 +19,11 @@
 #include "XspfUpdater.h"
 
 #include "Playlist.h"
-#include "utils/XspfLoader.h"
 #include "Pipeline.h"
-#include "utils/TomahawkUtils.h"
 #include "Source.h"
+#include "utils/XspfLoader.h"
+#include "utils/TomahawkUtils.h"
+#include "utils/Logger.h"
 
 #include <QTimer>
 
@@ -100,6 +101,11 @@ XspfUpdater::updateNow()
         qWarning() << "XspfUpdater not updating because we have an empty url...";
         return;
     }
+    if ( !playlist()->loaded() )
+    {
+        tDebug() << "XspfUpdater not updating because playlist wasn't loaded yet...";
+        return;
+    }
 
     XSPFLoader* l = new XSPFLoader( false, false );
     l->setAutoResolveTracks( false );