diff --git a/src/filescanner.c b/src/filescanner.c
index 8440c86c..4736b5dc 100644
--- a/src/filescanner.c
+++ b/src/filescanner.c
@@ -1105,12 +1105,12 @@ filescanner(void *arg)
   else
     bulk_scan(F_SCAN_BULK);
 
-#ifdef HAVE_SPOTIFY_H
-  spotify_login(NULL);
-#endif
-
   if (!scan_exit)
     {
+#ifdef HAVE_SPOTIFY_H
+      spotify_login(NULL);
+#endif
+
       /* Enable inotify */
       event_add(&inoev, NULL);