diff --git a/Playlist/PlaylistLoader.m b/Playlist/PlaylistLoader.m
index ea4108518..3cc326f23 100644
--- a/Playlist/PlaylistLoader.m
+++ b/Playlist/PlaylistLoader.m
@@ -751,7 +751,9 @@ NSURL *_Nullable urlForPath(NSString *_Nullable path);
 		});
 	}
 
-	[playlistController commitPersistentStore];
+	dispatch_sync_reentrant(dispatch_get_main_queue(), ^{
+		[self->playlistController commitPersistentStore];
+	});
 
 	[playlistController performSelectorOnMainThread:@selector(updateTotalTime) withObject:nil waitUntilDone:NO];