diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js
index 2f59ff5d..de38fca3 100644
--- a/src/renderer/main/vueapp.js
+++ b/src/renderer/main/vueapp.js
@@ -2247,6 +2247,11 @@ const app = new Vue({
                 artistId = item.relationships.artists.data[0].id;
               }
             }
+            if (item.relationships.albums && item.relationships.albums.data.length > 0) {
+              if (item.relationships.albums.data[0].attributes.artistUrl) {
+                artistId = item.relationships.albums.data[0].attributes.artistUrl.split("/").pop();
+              }
+            }
             if (artistId == "") {
               const url = item.relationships.catalog.data[0].attributes.artistUrl;
               artistId = url.substring(url.lastIndexOf("/") + 1);
diff --git a/src/renderer/views/pages/search.ejs b/src/renderer/views/pages/search.ejs
index 078d1865..79e13093 100644
--- a/src/renderer/views/pages/search.ejs
+++ b/src/renderer/views/pages/search.ejs
@@ -37,7 +37,7 @@
             <template v-if="searchType == 'catalog'">
                 <h3>{{app.getLz('term.topResult')}}</h3>
                 <mediaitem-scroller-horizontal
-                        :items="search.results[search.results.meta.results.order[0]]['data']"></mediaitem-scroller-horizontal>
+                        :items="search?.results[search?.results?.meta?.results?.order[0]]?.data"></mediaitem-scroller-horizontal>
                 <div class="row">
                     <div class="col" v-if="search.results.song">
                         <div class="row">