diff --git a/src/routes/Search/Search.js b/src/routes/Search/Search.js
index 8dcc6b69b..f68eeacfe 100644
--- a/src/routes/Search/Search.js
+++ b/src/routes/Search/Search.js
@@ -5,13 +5,13 @@ const useSearch = require('./useSearch');
 const styles = require('./styles');
 
 const Search = ({ queryParams }) => {
-    const groups = useSearch(queryParams);
+    const search = useSearch(queryParams);
     return (
         <div className={styles['search-container']}>
             <MainNavBar className={styles['nav-bar']} />
             <div className={styles['search-content']}>
                 {
-                    !queryParams.has('q') || queryParams.get('q').length === 0 || groups.length === 0 ?
+                    !queryParams.has('q') || queryParams.get('q').length === 0 ?
                         <div className={styles['message-container']}>
                             <div className={styles['message-content']}>
                                 <Icon className={styles['icon']} icon={'ic_movies'} />
@@ -23,36 +23,43 @@ const Search = ({ queryParams }) => {
                             </div>
                         </div>
                         :
-                        groups.map(({ request, content }, index) => {
-                            switch (content.type) {
-                                case 'Ready':
-                                    return (
-                                        <MetaRow
-                                            key={`${index}${request.base}${content.type} Ready`}
-                                            className={styles['search-row']}
-                                            title={`${request.path.id} - ${request.path.type_name}`}
-                                            items={content.content}
-                                        />
-                                    );
-                                case 'Err':
-                                    return (
-                                        <MetaRow
-                                            key={`${index}${request.base}${content.type}`}
-                                            className={styles['search-row']}
-                                            title={`${request.path.id} - ${request.path.type_name} Err`}
-                                            message={`${content.content.type} ${typeof content.content.content === 'string' ? content.content.content : ''}`}
-                                        />
-                                    );
-                                case 'Loading':
-                                    return (
-                                        <MetaRow.Placeholder
-                                            key={`${index}${request.base}${content.type} Loading`}
-                                            className={styles['search-row-placeholder']}
-                                            title={`${request.path.id} - ${request.path.type_name}`}
-                                        />
-                                    );
-                            }
-                        })
+                        search.items_groups && search.items_groups.length > 0 && search.items_groups.some(group => group.content.type !== 'Err') ?
+                            search.items_groups.map(({ request, content }, index) => {
+                                switch (content.type) {
+                                    case 'Ready':
+                                        return (
+                                            <MetaRow
+                                                key={`${index}${request.base}${content.type} Ready`}
+                                                className={styles['search-row']}
+                                                title={`${request.path.id} - ${request.path.type_name}`}
+                                                items={content.content}
+                                            />
+                                        );
+                                    case 'Err':
+                                        return (
+                                            <MetaRow
+                                                key={`${index}${request.base}${content.type}`}
+                                                className={styles['search-row']}
+                                                title={`${request.path.id} - ${request.path.type_name} Err`}
+                                                message={`${content.content.type} ${typeof content.content.content === 'string' ? content.content.content : ''}`}
+                                            />
+                                        );
+                                    case 'Loading':
+                                        return (
+                                            <MetaRow.Placeholder
+                                                key={`${index}${request.base}${content.type} Loading`}
+                                                className={styles['search-row-placeholder']}
+                                                title={`${request.path.id} - ${request.path.type_name}`}
+                                            />
+                                        );
+                                }
+                            })
+                            :
+                            <div className={styles['message-container']}>
+                                <div className={styles['message-content']}>
+                                    <div className={styles['label']}>No metadata was found</div>
+                                </div>
+                            </div>
                 }
             </div>
         </div>