diff --git a/frontend/src/Movie/Index/MovieIndexItemConnector.js b/frontend/src/Movie/Index/MovieIndexItemConnector.js
index 5a0ac4714..04ef32757 100644
--- a/frontend/src/Movie/Index/MovieIndexItemConnector.js
+++ b/frontend/src/Movie/Index/MovieIndexItemConnector.js
@@ -63,17 +63,8 @@ function createMapStateToProps() {
           command.body.movieIds.includes(movie.id)
         );
       });
-
-      let queueStatus = null;
-      let queueState = null;
-
-      for (const q in queueItems) {
-        if (queueItems[q].movieId === movie.id) {
-          queueStatus = queueItems[q].status;
-          queueState = queueItems[q].trackedDownloadState;
-          break;
-        }
-      }
+      
+      const firstQueueItem = queueItems.find((q) => q.movieId === movie.id);
 
       return {
         ...movie,
@@ -81,8 +72,8 @@ function createMapStateToProps() {
         showSearchAction,
         isRefreshingMovie,
         isSearchingMovie,
-        queueStatus,
-        queueState
+        queueStatus: firstQueueItem.status,
+        queueState: firstQueueItem.trackedDownloadState
       };
     }
   );