diff --git a/src/httpd_daap.c b/src/httpd_daap.c
index 0a3809b8..df51684f 100644
--- a/src/httpd_daap.c
+++ b/src/httpd_daap.c
@@ -1674,11 +1674,11 @@ daap_reply_playlists(struct evhttp_request *req, struct evbuffer *evbuf, char **
        */
       if ((database == DAAP_DB_RADIO) && (plstreams == 0))
 	continue;
-      if ((database != DAAP_DB_RADIO) && (plstreams == plitems))
+      if ((database != DAAP_DB_RADIO) && (plstreams > 0) && (plstreams == plitems))
 	continue;
 
-      /* Don't add empty playlists */
-      if ((plid > 1) && (plitems == 0))
+      /* Don't add empty Smart playlists */
+      if ((plid > 1) && (plitems == 0) && (pltype == PL_SMART))
 	continue;
 
       npls++;
@@ -1723,8 +1723,7 @@ daap_reply_playlists(struct evhttp_request *req, struct evbuffer *evbuf, char **
 	}
 
       /* Item count (mimc) */
-      if (plitems > 0)
-	dmap_add_int(playlist, "mimc", plitems);
+      dmap_add_int(playlist, "mimc", plitems);
 
       /* Container ID (mpco) */
       ret = safe_atoi32(dbpli.parent_id, &plparent);
diff --git a/src/spotify.c b/src/spotify.c
index ea74b723..680d3b6d 100644
--- a/src/spotify.c
+++ b/src/spotify.c
@@ -1266,7 +1266,8 @@ logged_in(sp_session *sess, sp_error error)
 
   memset(&pli, 0, sizeof(struct playlist_info));
   pli.title = "Spotify";
-  pli.path = "spotify:base_playlist";
+  pli.type = PL_PLAIN;
+  pli.path = "spotify:playlistfolder";
 
   ret = db_pl_add(&pli, &g_base_plid);
   if (ret < 0)