diff --git a/src/routes/Board/Board.js b/src/routes/Board/Board.js
index b3b7860f8..2cbe193c9 100644
--- a/src/routes/Board/Board.js
+++ b/src/routes/Board/Board.js
@@ -52,7 +52,7 @@ const Board = () => {
                             null
                     }
                     {board.catalogs.map((catalog, index) => {
-                        switch (catalog.content.type) {
+                        switch (catalog.content?.type) {
                             case 'Ready': {
                                 return (
                                     <MetaRow
@@ -76,7 +76,7 @@ const Board = () => {
                                     />
                                 );
                             }
-                            case 'Loading': {
+                            default: {
                                 return (
                                     <MetaRow.Placeholder
                                         key={index}
diff --git a/src/routes/Search/Search.js b/src/routes/Search/Search.js
index b2913f638..47fb15cba 100644
--- a/src/routes/Search/Search.js
+++ b/src/routes/Search/Search.js
@@ -69,7 +69,7 @@ const Search = ({ queryParams }) => {
                             </div>
                             :
                             search.catalogs.map((catalog, index) => {
-                                switch (catalog.content.type) {
+                                switch (catalog.content?.type) {
                                     case 'Ready': {
                                         return (
                                             <MetaRow
@@ -93,7 +93,7 @@ const Search = ({ queryParams }) => {
                                             />
                                         );
                                     }
-                                    case 'Loading': {
+                                    default: {
                                         return (
                                             <MetaRow.Placeholder
                                                 key={index}