diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c
index ff5584cfd5..841281c8e6 100644
--- a/apps/plugins/pictureflow/pictureflow.c
+++ b/apps/plugins/pictureflow/pictureflow.c
@@ -1398,7 +1398,7 @@ static int create_album_index(void)
     /* Albums */
     pf_idx.album_ct = 0;
     pf_idx.album_len =0;
-    pf_idx.album_untagged_idx = 0;
+    pf_idx.album_untagged_idx = -1;
     pf_idx.album_untagged_seek = -1;
 
     /* album_index starts at end of buf it will be rearranged when finalized */
@@ -1523,16 +1523,8 @@ retry_artist_lookup:
 
     /* remove any extra untagged albums
      * extra space is orphaned till restart */
-    for (i = 0; i < pf_idx.album_ct; i++)
-    {
-        if (pf_idx.album_index[i].artist_idx > 0)
-        {
-            if (i > 0) { i--; }
-            pf_idx.album_index += i;
-            pf_idx.album_ct -= i;
-            break;
-        }
-    }
+    pf_idx.album_index += pf_idx.album_untagged_idx + 1;
+    pf_idx.album_ct -= pf_idx.album_untagged_idx + 1;
 
     pf_idx.buf = buf;
     pf_idx.buf_sz = buf_size;