diff --git a/src/routes/Board/Board.js b/src/routes/Board/Board.js
index f0da1788a..cdb4027fd 100644
--- a/src/routes/Board/Board.js
+++ b/src/routes/Board/Board.js
@@ -21,14 +21,28 @@ const Board = () => {
         <div className={styles['board-container']}>
             <MainNavBar className={styles['nav-bar']} />
             <div className={styles['board-content']} tabIndex={-1}>
-                {catalogs.map((catalog) => (
-                    <BoardRow
-                        key={catalog.id}
-                        className={styles['addon-catalog-row']}
-                        title={catalog.title}
-                        items={catalog.items}
-                    />
-                ))}
+                {
+                    catalogs
+                        .filter(([_, response]) => response.type === 'Ready')
+                        .map(([request, response]) => [
+                            request,
+                            {
+                                ...response,
+                                content: response.content.map((item) => ({
+                                    ...item,
+                                    posterShape: item.posterShape || 'poster'
+                                }))
+                            }
+                        ])
+                        .map(([request, response], index) => (
+                            <BoardRow
+                                key={`${index}${request.transport_url}`}
+                                className={styles['addon-catalog-row']}
+                                title={`${request.resource_ref.id} - ${request.resource_ref.type_name}`}
+                                items={response.content}
+                            />
+                        ))
+                }
             </div>
         </div>
     );
diff --git a/src/routes/Board/useCatalogs.js b/src/routes/Board/useCatalogs.js
index 9d4fb0183..e4d20d1d9 100644
--- a/src/routes/Board/useCatalogs.js
+++ b/src/routes/Board/useCatalogs.js
@@ -5,23 +5,7 @@ const useCatalogs = () => {
     React.useEffect(() => {
         const onNewState = () => {
             const state = window.stateContainer.getState();
-            const catalogs = state.groups.reduce((catalogs, [request, response], index) => {
-                if (response.type === 'Ready') {
-                    catalogs.push({
-                        id: `${index}${request.transport_url}`,
-                        title: `${request.resource_ref.id} - ${request.resource_ref.type_name}`,
-                        items: response.content.map((item) => {
-                            return {
-                                ...item,
-                                posterShape: item.posterShape || 'poster'
-                            };
-                        })
-                    });
-                }
-
-                return catalogs;
-            }, []);
-            setCatalogs(catalogs);
+            setCatalogs(state.groups);
         };
         window.stateContainer.on('NewState', onNewState);
         window.stateContainer.dispatch({